summaryrefslogtreecommitdiffstats
path: root/projects.pro
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2010-09-08 12:27:43 +1000
committerJason McDonald <jason.mcdonald@nokia.com>2010-09-08 12:27:43 +1000
commitc4bf6792f6ffd551785b96d44f31d21543fe338e (patch)
treeca846e12f54633b848803a2ce16a1021c674d9e9 /projects.pro
parent4283bd37c6367c519b4d5f2640417f805e7f3196 (diff)
Revert "let WebKit inject itself into the qt configuration"
This reverts commit b35310bba20f0c33a61b03ea4eec6108ec873a7c.
Diffstat (limited to 'projects.pro')
-rw-r--r--projects.pro4
1 files changed, 1 insertions, 3 deletions
diff --git a/projects.pro b/projects.pro
index f94e1de565..373b04975e 100644
--- a/projects.pro
+++ b/projects.pro
@@ -159,13 +159,11 @@ INSTALLS += qmake
#mkspecs
mkspecs.path=$$[QT_INSTALL_DATA]/mkspecs
-mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$files($$QT_SOURCE_TREE/mkspecs/*)
-mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/modules
+mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$QT_SOURCE_TREE/mkspecs/*
unix {
DEFAULT_QMAKESPEC = $$QMAKESPEC
DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g
mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
- mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/default
}
win32:!equals(QT_BUILD_TREE, $$QT_SOURCE_TREE) {
# When shadow building on Windows, the default mkspec only exists in the build tree.