remove nonsense DEFINES
Change-Id: Ie079c52eb800878983501b9fe2b2f6c27df0cdb1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
parent
e9d50f2ec2
commit
bc328f8ec3
@ -10,4 +10,3 @@ QT = core testlib
|
|||||||
cross_compile: DEFINES += QMAKE_CROSS_COMPILED
|
cross_compile: DEFINES += QMAKE_CROSS_COMPILED
|
||||||
|
|
||||||
TESTDATA += testdata/*
|
TESTDATA += testdata/*
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -5,4 +5,3 @@ QWERTY_BUNDLE.files = some-file "existing file" "non-existing file"
|
|||||||
QWERTY_BUNDLE.path = QwertyData
|
QWERTY_BUNDLE.path = QwertyData
|
||||||
|
|
||||||
QMAKE_BUNDLE_DATA = QWERTY_BUNDLE
|
QMAKE_BUNDLE_DATA = QWERTY_BUNDLE
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -29,6 +29,3 @@ LIST = 1 2 3 4$${LITERAL_HASH}five
|
|||||||
!equals( LIST, 1 2 3 4$${LITERAL_HASH}five ) {
|
!equals( LIST, 1 2 3 4$${LITERAL_HASH}five ) {
|
||||||
message( "FAILED: using LITERAL_HASH" )
|
message( "FAILED: using LITERAL_HASH" )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -5,7 +5,3 @@ JOINEDLIBS = $$join(LIBS, "_")
|
|||||||
!contains(JOINEDLIBS, -lqui_-lqtest_-lqui) {
|
!contains(JOINEDLIBS, -lqui_-lqtest_-lqui) {
|
||||||
message("FAILED: duplibs")
|
message("FAILED: duplibs")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -12,7 +12,3 @@ O_BAR=$$fromfile(oink.pri,BAR)
|
|||||||
!equals(O_FOO,bar) {
|
!equals(O_FOO,bar) {
|
||||||
message( "FAILED: export() invisible from default_pre.prf through \$$fromfile()" )
|
message( "FAILED: export() invisible from default_pre.prf through \$$fromfile()" )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -10,4 +10,3 @@ HEADERS += object1.h \
|
|||||||
object8.h \
|
object8.h \
|
||||||
object9.h
|
object9.h
|
||||||
SOURCES += main.cpp
|
SOURCES += main.cpp
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -2,4 +2,3 @@ DESTDIR = ./
|
|||||||
|
|
||||||
HEADERS += object1.h object2.h object3.h object4.h object5.h object6.h object7.h
|
HEADERS += object1.h object2.h object3.h object4.h object5.h object6.h object7.h
|
||||||
SOURCES += main.cpp
|
SOURCES += main.cpp
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -17,7 +17,3 @@ callDoExport()
|
|||||||
!isEqual(EXPORTED, "foo bar baz") {
|
!isEqual(EXPORTED, "foo bar baz") {
|
||||||
message( "FAILED: global-scope exports [$$EXPORTED] != foo bar baz" )
|
message( "FAILED: global-scope exports [$$EXPORTED] != foo bar baz" )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -47,7 +47,3 @@ callTest($$value)
|
|||||||
!isEqual(RESULT,$$value) {
|
!isEqual(RESULT,$$value) {
|
||||||
message( "FAILED: result [$$RESULT] != $$value" )
|
message( "FAILED: result [$$RESULT] != $$value" )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -171,4 +171,3 @@ else: \
|
|||||||
testReplace($$shell_quote($$in), $$out, "shell_quote")
|
testReplace($$shell_quote($$in), $$out, "shell_quote")
|
||||||
|
|
||||||
testReplace($$reverse($$list(one two three)), three two one, "reverse")
|
testReplace($$reverse($$list(one two three)), three two one, "reverse")
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -1,3 +1 @@
|
|||||||
DEFINES = QT_DLL
|
DEFINES = QT_DLL
|
||||||
|
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -9,5 +9,3 @@ SOURCES=\
|
|||||||
main.cpp
|
main.cpp
|
||||||
CONFIG -= debug_and_release_target
|
CONFIG -= debug_and_release_target
|
||||||
QT += widgets
|
QT += widgets
|
||||||
|
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -5,4 +5,3 @@ include(existing_file.pri)
|
|||||||
# Test to see if by specifying full set of parameters to include()
|
# Test to see if by specifying full set of parameters to include()
|
||||||
# succeeds when the specified filed to include exists
|
# succeeds when the specified filed to include exists
|
||||||
include(existing_file.pri, "", false)
|
include(existing_file.pri, "", false)
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
# Test to see if include(), by default, fails when the specific file
|
# Test to see if include(), by default, fails when the specific file
|
||||||
# to include does not exist
|
# to include does not exist
|
||||||
include(missing_file.pri)
|
include(missing_file.pri)
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
# Specifying full set of parameters to include() to test that a warning
|
# Specifying full set of parameters to include() to test that a warning
|
||||||
# is shown for this non-existing file.
|
# is shown for this non-existing file.
|
||||||
include(missing_file.pri, "", false)
|
include(missing_file.pri, "", false)
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -18,7 +18,3 @@ INSTALLS+=test2
|
|||||||
target.path=dist
|
target.path=dist
|
||||||
target.depends=install_test1 install_test2
|
target.depends=install_test1 install_test2
|
||||||
INSTALLS+=target
|
INSTALLS+=target
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -2,4 +2,3 @@ TEMPLATE = app
|
|||||||
SOURCES = main.cpp
|
SOURCES = main.cpp
|
||||||
TARGET = "one space"
|
TARGET = "one space"
|
||||||
DESTDIR = ./
|
DESTDIR = ./
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -21,5 +21,3 @@ VAR ~= s/QT_+/Q_
|
|||||||
!contains( VAR, Q_DLL ) {
|
!contains( VAR, Q_DLL ) {
|
||||||
message( "FAILED: ~=" )
|
message( "FAILED: ~=" )
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -1,3 +1 @@
|
|||||||
# a = $$prompt(Prompteroo)
|
# a = $$prompt(Prompteroo)
|
||||||
|
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -18,7 +18,3 @@ rcc_test.depends = $$QMAKE_RCC
|
|||||||
QMAKE_EXTRA_COMPILERS += rcc_test
|
QMAKE_EXTRA_COMPILERS += rcc_test
|
||||||
|
|
||||||
DESTDIR = ./
|
DESTDIR = ./
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -12,7 +12,3 @@ INSTALLS+=target
|
|||||||
test.files=test.txt foo.bar
|
test.files=test.txt foo.bar
|
||||||
test.path=dist
|
test.path=dist
|
||||||
INSTALLS+=test
|
INSTALLS+=test
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -5,4 +5,3 @@ SOURCES = test_file.cpp \
|
|||||||
RESOURCES = test.qrc
|
RESOURCES = test.qrc
|
||||||
TARGET = simple_app
|
TARGET = simple_app
|
||||||
DESTDIR = ./
|
DESTDIR = ./
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -12,4 +12,3 @@ MOC_DIR = tmp
|
|||||||
OBJECTS_DIR = tmp
|
OBJECTS_DIR = tmp
|
||||||
TARGET = simple_dll
|
TARGET = simple_dll
|
||||||
DESTDIR = ./
|
DESTDIR = ./
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -11,5 +11,3 @@ MOC_DIR = tmp
|
|||||||
OBJECTS_DIR = tmp
|
OBJECTS_DIR = tmp
|
||||||
TARGET = simple_lib
|
TARGET = simple_lib
|
||||||
DESTDIR = ./
|
DESTDIR = ./
|
||||||
|
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -3,4 +3,3 @@ SOURCES = main.cpp
|
|||||||
|
|
||||||
extratarget.commands = @echo extra target worked OK
|
extratarget.commands = @echo extra target worked OK
|
||||||
QMAKE_EXTRA_TARGETS += extratarget
|
QMAKE_EXTRA_TARGETS += extratarget
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -4,4 +4,3 @@ SOURCES = test_file.cpp \
|
|||||||
main.cpp
|
main.cpp
|
||||||
TARGET = simple_app
|
TARGET = simple_app
|
||||||
DESTDIR = ./
|
DESTDIR = ./
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -12,4 +12,3 @@ MOC_DIR = tmp
|
|||||||
OBJECTS_DIR = tmp
|
OBJECTS_DIR = tmp
|
||||||
TARGET = simple_dll
|
TARGET = simple_dll
|
||||||
DESTDIR = ./
|
DESTDIR = ./
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -6,4 +6,3 @@ indirect.output = $$OUT_PWD/sub/indirect_test.txt
|
|||||||
copy.input = $$PWD/copy.txt
|
copy.input = $$PWD/copy.txt
|
||||||
copy.output = $$OUT_PWD/copy_test.txt
|
copy.output = $$OUT_PWD/copy_test.txt
|
||||||
copy.CONFIG = verbatim
|
copy.CONFIG = verbatim
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
@ -10,6 +10,3 @@ JOINEDNEWVAR = $$join( NEWVAR, "-" )
|
|||||||
!contains( JOINEDNEWVAR, 5-4-3 ) {
|
!contains( JOINEDNEWVAR, 5-4-3 ) {
|
||||||
message( "FAILED: member [$$JOINEDNEWVAR != 5-4-3]" )
|
message( "FAILED: member [$$JOINEDNEWVAR != 5-4-3]" )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
|
||||||
|
Loading…
Reference in New Issue
Block a user