diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-17 18:59:51 +0200 |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-07 12:50:01 +1000 |
| commit | b35310bba20f0c33a61b03ea4eec6108ec873a7c (patch) | |
| tree | 23dc640dfd3e2c6505bf511b9b789c10e6d717f4 /projects.pro | |
| parent | 37ab650b40623823c5e2b29a30ca7c2f2230f163 (diff) | |
let WebKit inject itself into the qt configuration
i.e., don't explicitly deal with qt_webkit_version.pri outside of the
webkit source directory.
Task-number: QTBUG-12379
Reviewed-by: Simon Hausmann
(cherry picked from commit b5b6cbb477b50c582d545b0e5e3a04626834e7e2)
Diffstat (limited to 'projects.pro')
| -rw-r--r-- | projects.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/projects.pro b/projects.pro index 373b04975e..f94e1de565 100644 --- a/projects.pro +++ b/projects.pro @@ -159,11 +159,13 @@ INSTALLS += qmake #mkspecs mkspecs.path=$$[QT_INSTALL_DATA]/mkspecs -mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$QT_SOURCE_TREE/mkspecs/* +mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$files($$QT_SOURCE_TREE/mkspecs/*) +mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/modules 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. |