Changeset 58661 in webkit

Timestamp:

May 2, 2010 2:48:07 PM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt] QtWebKit versioning added
​https://bugs.webkit.org/show_bug.cgi?id=37207

Patch by Janne Koskinen <​janne.p.koskinen@digia.com> on 2010-04-29
Reviewed by Simon Hausmann.

QtWebkit releases separated from Qt release cycle.

WebCore:

• WebCore.pro:

WebKit/qt:

• qtwebkit_version.pri: Added.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.pro (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/qtwebkit_version.pri (added)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-29  Janne Koskinen  <janne.p.koskinen@digia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] QtWebKit versioning added
+        https://bugs.webkit.org/show_bug.cgi?id=37207
+
+        QtWebkit releases separated from Qt release cycle.
+
+        * WebCore.pro:
+
 2010-05-02  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/WebCore/WebCore.pro

@@ -72 +72 @@
 CONFIG(QTDIR_build) {
     include($$QT_SOURCE_TREE/src/qbase.pri)
-    # Qt will set the version for us when building in Qt's tree
 } else {
-    VERSION = $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
     DESTDIR = $$OUTPUT_DIR/lib
     !static: DEFINES += QT_MAKEDLL
 }
+include($$PWD/../WebKit/qt/qtwebkit_version.pri)
+VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION}
 
 unix {

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-04-29  Janne Koskinen  <janne.p.koskinen@digia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] QtWebKit versioning added
+        https://bugs.webkit.org/show_bug.cgi?id=37207
+
+        QtWebkit releases separated from Qt release cycle.
+
+        * qtwebkit_version.pri: Added.
+
 2010-05-02  Benjamin Poulain  <benjamin.poulain@nokia.com>