diff options
20 files changed, 6 insertions, 23 deletions
diff --git a/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro b/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro index 6c0924cf7f..7390cec23f 100644 --- a/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro +++ b/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro @@ -1,7 +1,6 @@ HEADERS = window.h SOURCES = main.cpp \ window.cpp -CONFIG += qt # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/basicsortfiltermodel diff --git a/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro b/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro index 66ea1063c8..488a755b9d 100644 --- a/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro +++ b/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro @@ -3,7 +3,6 @@ HEADERS = mysortfilterproxymodel.h \ SOURCES = main.cpp \ mysortfilterproxymodel.cpp \ window.cpp -CONFIG += qt # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/customsortfiltermodel diff --git a/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro b/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro index fcbdfd997f..a83b6fc5bf 100644 --- a/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro +++ b/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro @@ -7,7 +7,6 @@ SOURCES = mainwindow.cpp \ treeitem.cpp \ treemodel.cpp \ main.cpp -CONFIG += qt # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/editabletreemodel diff --git a/examples/widgets/itemviews/interview/interview.pro b/examples/widgets/itemviews/interview/interview.pro index 08dd9b991e..a61d77613c 100644 --- a/examples/widgets/itemviews/interview/interview.pro +++ b/examples/widgets/itemviews/interview/interview.pro @@ -1,6 +1,5 @@ TEMPLATE = app -CONFIG += qt warn_on HEADERS += model.h SOURCES += model.cpp main.cpp RESOURCES += interview.qrc diff --git a/examples/widgets/itemviews/simpledommodel/simpledommodel.pro b/examples/widgets/itemviews/simpledommodel/simpledommodel.pro index e52ea4f71e..db15632ba9 100644 --- a/examples/widgets/itemviews/simpledommodel/simpledommodel.pro +++ b/examples/widgets/itemviews/simpledommodel/simpledommodel.pro @@ -5,7 +5,6 @@ SOURCES = domitem.cpp \ dommodel.cpp \ main.cpp \ mainwindow.cpp -CONFIG += qt QT += xml widgets # install diff --git a/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro b/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro index 289939fb2f..674b8e8c68 100644 --- a/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro +++ b/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro @@ -4,7 +4,6 @@ RESOURCES = simpletreemodel.qrc SOURCES = treeitem.cpp \ treemodel.cpp \ main.cpp -CONFIG += qt # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/simpletreemodel diff --git a/examples/widgets/richtext/textedit/textedit.pro b/examples/widgets/richtext/textedit/textedit.pro index a2090231c5..fb99e0ee2b 100644 --- a/examples/widgets/richtext/textedit/textedit.pro +++ b/examples/widgets/richtext/textedit/textedit.pro @@ -1,8 +1,6 @@ TEMPLATE = app TARGET = textedit -CONFIG += qt warn_on - HEADERS = textedit.h SOURCES = textedit.cpp \ main.cpp diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 4323910e4a..b06b9d6cfc 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -4,6 +4,6 @@ load(exclusive_builds) CONFIG = \ - lex yacc warn_on debug exceptions depend_includepath \ + lex yacc debug exceptions depend_includepath \ testcase_targets import_plugins import_qpa_plugin \ $$CONFIG diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index cb799711c9..159733e02e 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -111,7 +111,6 @@ TEMPLATE = lib DESTDIR = $$eval(QT.$${MODULE}.libs) win32:!wince*:exists($$[QT_INSTALL_PREFIX]/.qmake.cache): DLLDESTDIR = $$eval(QT.$${MODULE}.bins) -CONFIG += qt warn_on depend_includepath CONFIG += qmake_cache target_qt QMAKE_DOCS_TARGETDIR = qt$${MODULE} diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf index f665479795..16db6c7972 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -14,7 +14,7 @@ TEMPLATE = app load(qt_build_paths) DESTDIR = $$MODULE_BASE_OUTDIR/bin -CONFIG += qt warn_on console +CONFIG += console isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle host_build { diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 1bf603e874..aff0a9efda 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -1,5 +1,3 @@ -CONFIG += depend_includepath - SKIP_DEPENDS += qconfig.h qmodules.h DEFINES += QT_NO_TEXTCODEC QT_NO_LIBRARY QT_NO_COMPRESS QT_NO_UNICODETABLES \ QT_NO_GEOM_VARIANT QT_NO_DATASTREAM diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index e5da5bd97f..32eae0b9fe 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -5,7 +5,7 @@ TEMPLATE = lib TARGET = qtmain DESTDIR = $$QT.core.libs -CONFIG += static warn_on depend_includepath +CONFIG += static QT = core contains(QT_CONFIG, build_all):CONFIG += build_all diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro index 0897a6b3ba..8dd8d930c1 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro @@ -4,8 +4,6 @@ TARGET = tst_qmimedatabase-xml QT = core testlib concurrent -CONFIG += depend_includepath - SOURCES += tst_qmimedatabase-xml.cpp HEADERS += ../tst_qmimedatabase.h diff --git a/tests/auto/tools/qmake/testdata/one_space/one_space.pro b/tests/auto/tools/qmake/testdata/one_space/one_space.pro index 651035df69..5f48aef119 100644 --- a/tests/auto/tools/qmake/testdata/one_space/one_space.pro +++ b/tests/auto/tools/qmake/testdata/one_space/one_space.pro @@ -1,5 +1,4 @@ TEMPLATE = app -CONFIG += qt warn_on SOURCES = main.cpp TARGET = "one space" DESTDIR = ./ diff --git a/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro b/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro index c3dd252d25..139c4153f5 100644 --- a/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro +++ b/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro @@ -1,5 +1,4 @@ TEMPLATE = app -CONFIG += qt warn_on TARGET = quotedfilenames SOURCES = main.cpp diff --git a/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro b/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro index a677388fae..3d30e25b68 100644 --- a/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro +++ b/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro @@ -1,5 +1,4 @@ TEMPLATE = app -CONFIG += qt warn_on HEADERS = test_file.h SOURCES = test_file.cpp \ main.cpp diff --git a/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro b/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro index f74067e2c9..4b7b3f31ce 100644 --- a/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro +++ b/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += qt warn_on dll +CONFIG += dll win32:DEFINES += SIMPLEDLL_MAKEDLL diff --git a/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro b/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro index bc239ad1a8..c04ed05ff3 100644 --- a/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro +++ b/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += qt warn_on release staticlib +CONFIG += release staticlib CONFIG -= dll HEADERS = simple.h diff --git a/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro b/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro index df8e81aa7b..db1d57b502 100644 --- a/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro +++ b/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro @@ -1,5 +1,4 @@ TEMPLATE = app -CONFIG += qt warn_on HEADERS = test_file.h SOURCES = test_file.cpp \ main.cpp diff --git a/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro index f74067e2c9..4b7b3f31ce 100644 --- a/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro +++ b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += qt warn_on dll +CONFIG += dll win32:DEFINES += SIMPLEDLL_MAKEDLL |