diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-15 08:25:24 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-15 08:25:24 (GMT) |
| commit | 37ed99a30839696a95c498f7d99a3505936ac29c (patch) | |
| tree | 768aa008588c012235798e22d45121aa8264fc1d /src/3rdparty/webkit/WebCore/WebCore.pro | |
| parent | 7390cfbcbd5000a7da3eb5dbef790d114b06d042 (diff) | |
| download | Qt-37ed99a30839696a95c498f7d99a3505936ac29c.zip Qt-37ed99a30839696a95c498f7d99a3505936ac29c.tar.gz Qt-37ed99a30839696a95c498f7d99a3505936ac29c.tar.bz2 | |
Updated WebKit to 40c2d6907ef75288b4f15e7fad334b9138acdbbf
Integrated fix:
|| <https://webkit.org/b/40487> || [Qt] The qt_webkit_version.pri file gets overwritten on install ||
Diffstat (limited to 'src/3rdparty/webkit/WebCore/WebCore.pro')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 048fc93..07ef474 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -2845,12 +2845,7 @@ contains(DEFINES, ENABLE_SYMBIAN_DIALOG_PROVIDERS) { include($$PWD/../WebKit/qt/Api/headers.pri) HEADERS += $$WEBKIT_API_HEADERS -CONFIG(QTDIR_build) { - modfile.files = $$moduleFile - modfile.path = $$[QMAKE_MKSPECS]/modules - - INSTALLS += modfile -} else { +!CONFIG(QTDIR_build) { exists($$OUTPUT_DIR/include/QtWebKit/classheaders.pri): include($$OUTPUT_DIR/include/QtWebKit/classheaders.pri) WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS |