Changeset 61179 in webkit

Timestamp:

Jun 15, 2010 1:15:49 AM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt] The qt_webkit_version.pri file gets overwritten on install
​https://bugs.webkit.org/show_bug.cgi?id=40487

Patch by Jocelyn Turcotte <​jocelyn.turcotte@nokia.com> on 2010-06-15
Reviewed by Simon Hausmann.

Don't install qt_webkit_version.pri when building WebKit inside of Qt.
The import of WebKit into Qt will take care of providing the file
in mkspecs/modules and it'll be installed through projects.pro.

• WebCore.pro:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.pro (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-15  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] The qt_webkit_version.pri file gets overwritten on install
+        https://bugs.webkit.org/show_bug.cgi?id=40487
+
+        Don't install qt_webkit_version.pri when building WebKit inside of Qt.
+        The import of WebKit into Qt will take care of providing the file
+        in mkspecs/modules and it'll be installed through projects.pro.
+
+        * WebCore.pro:
+
 2010-06-15  Tony Chang  <tony@chromium.org>
 

trunk/WebCore/WebCore.pro

@@ -2974 +2974 @@
 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