diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-14 19:41:04 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-17 14:00:26 +0100 |
| commit | 7c4193b031c199c7f614faf4ebf2d67a79e6d80a (patch) | |
| tree | 5e8167e863c0db2285c8fb1ebb696fae14ab26a5 | |
| parent | 83af7444bf110b5b42970f924c0feeea3d661a73 (diff) | |
remove some unnecessary CONFIG additions
qt is already added by spec_pre.prf, warn_on and depend_includepath by
default_pre.prf.
Change-Id: I4f02ef09f19cf0e4c7093f3fe30d5ca34daa194f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 files changed, 4 insertions, 5 deletions
diff --git a/Source/WebKit/qt/declarative/experimental/experimental.pri b/Source/WebKit/qt/declarative/experimental/experimental.pri index 2dbfd4bf4..547e66bcc 100644 --- a/Source/WebKit/qt/declarative/experimental/experimental.pri +++ b/Source/WebKit/qt/declarative/experimental/experimental.pri @@ -9,7 +9,7 @@ TARGET = qmlwebkitexperimentalplugin TARGET.module_name = QtWebKit/experimental -CONFIG += qt plugin +CONFIG += plugin QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir copy2build.input = QMLDIRFILE diff --git a/Source/WebKit/qt/declarative/public.pri b/Source/WebKit/qt/declarative/public.pri index 32b3900be..5fc5985eb 100644 --- a/Source/WebKit/qt/declarative/public.pri +++ b/Source/WebKit/qt/declarative/public.pri @@ -9,7 +9,7 @@ TARGET = qmlwebkitplugin TARGET.module_name = QtWebKit -CONFIG += qt plugin +CONFIG += plugin QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir copy2build.input = QMLDIRFILE diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro index 3fd3d4583..1000eeef1 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro +++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro @@ -4,7 +4,7 @@ TARGET = tst_qmltests_DesktopBehavior OBJECTS_DIR = obj_DesktopBehavior/$$activeBuildConfig() QT += webkit-private -CONFIG += warn_on testcase +CONFIG += testcase QT += qmltest diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro index b340235e4..a6196398d 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro +++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro @@ -4,7 +4,7 @@ TARGET = tst_qmltests_WebView OBJECTS_DIR = obj_WebView/$$activeBuildConfig() QT += webkit-private -CONFIG += warn_on testcase +CONFIG += testcase QT += qmltest diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf index 589671883..dbaa64ff4 100644 --- a/Tools/qmake/mkspecs/features/default_post.prf +++ b/Tools/qmake/mkspecs/features/default_post.prf @@ -36,7 +36,6 @@ CONFIG(release, debug|release): DEFINES *= NDEBUG DEFINES += $$configDefines() -CONFIG += depend_includepath DEPENDPATH += $$OUT_PWD INCLUDEPATH += \ |