1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove some unnecessary CONFIG additions

Browse Source 
qt is already added by spec_pre.prf, warn_on and depend_includepath by
default_pre.prf.

Change-Id: Ic00e0ba496d698ed9659c476f2ca99fc0f86a093
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2012-12-14 19:17:20 +01:00 committed by The Qt Project
parent dcfa8926ff
commit 09331062bb
20 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
View File

@ -1,7 +1,6 @@
HEADERS = window.h HEADERS = window.h
SOURCES = main.cpp \ SOURCES = main.cpp \
window.cpp window.cpp
CONFIG += qt
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/basicsortfiltermodel target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/basicsortfiltermodel

1
examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro
View File

@ -3,7 +3,6 @@ HEADERS = mysortfilterproxymodel.h \
SOURCES = main.cpp \ SOURCES = main.cpp \
mysortfilterproxymodel.cpp \ mysortfilterproxymodel.cpp \
window.cpp window.cpp
CONFIG += qt
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/customsortfiltermodel target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/customsortfiltermodel

1
examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro
View File

@ -7,7 +7,6 @@ SOURCES = mainwindow.cpp \
treeitem.cpp \ treeitem.cpp \
treemodel.cpp \ treemodel.cpp \
main.cpp main.cpp
CONFIG += qt
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/editabletreemodel target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/editabletreemodel

1
examples/widgets/itemviews/interview/interview.pro
View File

@ -1,6 +1,5 @@
TEMPLATE = app TEMPLATE = app
CONFIG += qt warn_on
HEADERS += model.h HEADERS += model.h
SOURCES += model.cpp main.cpp SOURCES += model.cpp main.cpp
RESOURCES += interview.qrc RESOURCES += interview.qrc

1
examples/widgets/itemviews/simpledommodel/simpledommodel.pro
View File

@ -5,7 +5,6 @@ SOURCES = domitem.cpp \
dommodel.cpp \ dommodel.cpp \
main.cpp \ main.cpp \
mainwindow.cpp mainwindow.cpp
CONFIG += qt
QT += xml widgets QT += xml widgets
# install # install

1
examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro
View File

@ -4,7 +4,6 @@ RESOURCES = simpletreemodel.qrc
SOURCES = treeitem.cpp \ SOURCES = treeitem.cpp \
treemodel.cpp \ treemodel.cpp \
main.cpp main.cpp
CONFIG += qt
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/simpletreemodel target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/simpletreemodel

2
examples/widgets/richtext/textedit/textedit.pro
View File

@ -1,8 +1,6 @@
TEMPLATE = app TEMPLATE = app
TARGET = textedit TARGET = textedit
CONFIG += qt warn_on
HEADERS = textedit.h HEADERS = textedit.h
SOURCES = textedit.cpp \ SOURCES = textedit.cpp \
main.cpp main.cpp

2
mkspecs/features/default_pre.prf
View File

@ -4,6 +4,6 @@
load(exclusive_builds) load(exclusive_builds)
CONFIG = \ CONFIG = \
lex yacc warn_on debug exceptions depend_includepath \ lex yacc debug exceptions depend_includepath \
testcase_targets import_plugins import_qpa_plugin \ testcase_targets import_plugins import_qpa_plugin \
$$CONFIG $$CONFIG

1
mkspecs/features/qt_module.prf
View File

@ -111,7 +111,6 @@ TEMPLATE = lib
DESTDIR = $$eval(QT.$${MODULE}.libs) DESTDIR = $$eval(QT.$${MODULE}.libs)
win32:!wince*:exists($$[QT_INSTALL_PREFIX]/.qmake.cache): DLLDESTDIR = $$eval(QT.$${MODULE}.bins) win32:!wince*:exists($$[QT_INSTALL_PREFIX]/.qmake.cache): DLLDESTDIR = $$eval(QT.$${MODULE}.bins)
CONFIG += qt warn_on depend_includepath
CONFIG += qmake_cache target_qt CONFIG += qmake_cache target_qt
QMAKE_DOCS_TARGETDIR = qt$${MODULE} QMAKE_DOCS_TARGETDIR = qt$${MODULE}

2
mkspecs/features/qt_tool.prf
View File

@ -14,7 +14,7 @@ TEMPLATE = app
load(qt_build_paths) load(qt_build_paths)
DESTDIR = $$MODULE_BASE_OUTDIR/bin DESTDIR = $$MODULE_BASE_OUTDIR/bin
CONFIG += qt warn_on console CONFIG += console
isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle
host_build { host_build {

2
qmake/qmake.pri
View File

@ -1,5 +1,3 @@
CONFIG += depend_includepath
SKIP_DEPENDS += qconfig.h qmodules.h SKIP_DEPENDS += qconfig.h qmodules.h
DEFINES += QT_NO_TEXTCODEC QT_NO_LIBRARY QT_NO_COMPRESS QT_NO_UNICODETABLES \ DEFINES += QT_NO_TEXTCODEC QT_NO_LIBRARY QT_NO_COMPRESS QT_NO_UNICODETABLES \
QT_NO_GEOM_VARIANT QT_NO_DATASTREAM QT_NO_GEOM_VARIANT QT_NO_DATASTREAM

2
src/winmain/winmain.pro
View File

@ -5,7 +5,7 @@ TEMPLATE = lib
TARGET = qtmain TARGET = qtmain
DESTDIR = $$QT.core.libs DESTDIR = $$QT.core.libs
CONFIG += static warn_on depend_includepath CONFIG += static
QT = core QT = core
contains(QT_CONFIG, build_all):CONFIG += build_all contains(QT_CONFIG, build_all):CONFIG += build_all

2
tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro
View File

@ -4,8 +4,6 @@ TARGET = tst_qmimedatabase-xml
QT = core testlib concurrent QT = core testlib concurrent
CONFIG += depend_includepath
SOURCES += tst_qmimedatabase-xml.cpp SOURCES += tst_qmimedatabase-xml.cpp
HEADERS += ../tst_qmimedatabase.h HEADERS += ../tst_qmimedatabase.h

1
tests/auto/tools/qmake/testdata/one_space/one_space.pro vendored
View File

@ -1,5 +1,4 @@
TEMPLATE = app TEMPLATE = app
CONFIG += qt warn_on
SOURCES = main.cpp SOURCES = main.cpp
TARGET = "one space" TARGET = "one space"
DESTDIR = ./ DESTDIR = ./

1
tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro vendored
View File

@ -1,5 +1,4 @@
TEMPLATE = app TEMPLATE = app
CONFIG += qt warn_on
TARGET = quotedfilenames TARGET = quotedfilenames
SOURCES = main.cpp SOURCES = main.cpp

1
tests/auto/tools/qmake/testdata/simple_app/simple_app.pro vendored
View File

@ -1,5 +1,4 @@
TEMPLATE = app TEMPLATE = app
CONFIG += qt warn_on
HEADERS = test_file.h HEADERS = test_file.h
SOURCES = test_file.cpp \ SOURCES = test_file.cpp \
main.cpp main.cpp

2
tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro vendored
View File

@ -1,5 +1,5 @@
TEMPLATE = lib TEMPLATE = lib
CONFIG += qt warn_on dll CONFIG += dll
win32:DEFINES += SIMPLEDLL_MAKEDLL win32:DEFINES += SIMPLEDLL_MAKEDLL

2
tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro vendored
View File

@ -1,5 +1,5 @@
TEMPLATE = lib TEMPLATE = lib
CONFIG += qt warn_on release staticlib CONFIG += release staticlib
CONFIG -= dll CONFIG -= dll
HEADERS = simple.h HEADERS = simple.h

1
tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro vendored
View File

@ -1,5 +1,4 @@
TEMPLATE = app TEMPLATE = app
CONFIG += qt warn_on
HEADERS = test_file.h HEADERS = test_file.h
SOURCES = test_file.cpp \ SOURCES = test_file.cpp \
main.cpp main.cpp

2
tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro vendored
View File

@ -1,5 +1,5 @@
TEMPLATE = lib TEMPLATE = lib
CONFIG += qt warn_on dll CONFIG += dll
win32:DEFINES += SIMPLEDLL_MAKEDLL win32:DEFINES += SIMPLEDLL_MAKEDLL