diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-08 02:27:33 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-08 02:27:33 (GMT) |
| commit | 4283bd37c6367c519b4d5f2640417f805e7f3196 (patch) | |
| tree | 576b20ca3fc3adb8e0aa5c1e3a6510c5764b9771 | |
| parent | 0f4bdd4b76b68bcf55fdffb59b85c875ae08cfa9 (diff) | |
| download | Qt-4283bd37c6367c519b4d5f2640417f805e7f3196.zip Qt-4283bd37c6367c519b4d5f2640417f805e7f3196.tar.gz Qt-4283bd37c6367c519b4d5f2640417f805e7f3196.tar.bz2 | |
Revert "fix qt_webkit_version.pri install for in-Qt builds"
This reverts commit 2ed8ae55ea8e37060538bd45276e5f72e98f36c4.
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 537cdd3..ac0c47c 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -2857,25 +2857,6 @@ contains(DEFINES, ENABLE_SYMBIAN_DIALOG_PROVIDERS) { } } -!symbian { - modfile.files = $$moduleFile - modfile.path = $$[QMAKE_MKSPECS]/modules - - INSTALLS += modfile -} else { - # INSTALLS is not implemented in qmake's s60 generators, copy headers manually - - inst_modfile.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT} - inst_modfile.input = moduleFile - inst_modfile.output = $$[QMAKE_MKSPECS]/modules - inst_modfile.CONFIG = no_clean - - QMAKE_EXTRA_COMPILERS += inst_modfile - - install.depends += compiler_inst_modfile_make_all - QMAKE_EXTRA_TARGETS += install -} - include($$PWD/../WebKit/qt/Api/headers.pri) HEADERS += $$WEBKIT_API_HEADERS @@ -2892,7 +2873,10 @@ HEADERS += $$WEBKIT_API_HEADERS !isEmpty(INSTALL_LIBS): target.path = $$INSTALL_LIBS else: target.path = $$[QT_INSTALL_LIBS] - INSTALLS += target headers + modfile.files = $$moduleFile + modfile.path = $$[QMAKE_MKSPECS]/modules + + INSTALLS += target headers modfile } else { # INSTALLS is not implemented in qmake's s60 generators, copy headers manually inst_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT} @@ -2904,7 +2888,15 @@ HEADERS += $$WEBKIT_API_HEADERS QMAKE_EXTRA_COMPILERS += inst_headers - install.depends += compiler_inst_headers_make_all + inst_modfile.commands = $$inst_headers.commands + inst_modfile.input = moduleFile + inst_modfile.output = $$[QMAKE_MKSPECS]/modules + inst_modfile.CONFIG = no_clean + + QMAKE_EXTRA_COMPILERS += inst_modfile + + install.depends += compiler_inst_headers_make_all compiler_inst_modfile_make_all + QMAKE_EXTRA_TARGETS += install } win32-*|wince* { |