diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-31 13:02:16 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-07 02:50:26 (GMT) |
| commit | 2ed8ae55ea8e37060538bd45276e5f72e98f36c4 (patch) | |
| tree | eeed4b80311a97072fbca5f4d017ce19bd6cdbb8 | |
| parent | b35310bba20f0c33a61b03ea4eec6108ec873a7c (diff) | |
| download | Qt-2ed8ae55ea8e37060538bd45276e5f72e98f36c4.zip Qt-2ed8ae55ea8e37060538bd45276e5f72e98f36c4.tar.gz Qt-2ed8ae55ea8e37060538bd45276e5f72e98f36c4.tar.bz2 | |
fix qt_webkit_version.pri install for in-Qt builds
always add the target, even if building inside Qt - as opposed to the
headers and libraries, there are no rules for that coming from
qbase.pri.
Task-number: QTBUG-13306
(cherry picked from commit a37dfcfdaa8029f25217fdec6dd6ec1a46929af2)
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index ac0c47c..537cdd3 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -2857,6 +2857,25 @@ 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 @@ -2873,10 +2892,7 @@ HEADERS += $$WEBKIT_API_HEADERS !isEmpty(INSTALL_LIBS): target.path = $$INSTALL_LIBS else: target.path = $$[QT_INSTALL_LIBS] - modfile.files = $$moduleFile - modfile.path = $$[QMAKE_MKSPECS]/modules - - INSTALLS += target headers modfile + INSTALLS += target headers } else { # INSTALLS is not implemented in qmake's s60 generators, copy headers manually inst_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT} @@ -2888,15 +2904,7 @@ HEADERS += $$WEBKIT_API_HEADERS QMAKE_EXTRA_COMPILERS += inst_headers - 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 + install.depends += compiler_inst_headers_make_all } win32-*|wince* { |