[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[jocelyn.turcotte at nokia.com]

The following commit has been merged in the webkit-1.1 branch:
commit 08c42d6c1eae37148dbc8be0771ba1cd6a3f8e9c
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 24 14:01:27 2010 +0000

    [Qt] Corrects build break of QtLauncher on Windows.
    The VERSION variable was not set anymore while building in trunk.
    
    Reviewed by nobody, build fix.
    
    * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55190 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4cc57a3..67bc041 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-24  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by nobody, build fix.
+
+        [Qt] Corrects build break of QtLauncher on Windows.
+        The VERSION variable was not set anymore while building in trunk.
+
+        * WebCore.pro:
+
 2010-02-24  Alexander Pavlov  <apavlov at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index c625224..81ac130 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -47,10 +47,6 @@ CONFIG(standalone_package) {
     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/generated
     isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/../JavaScriptCore/generated
 
-    # Qt will set the version for us when building in Qt's tree
-    CONFIG(QTDIR_build):include($$QT_SOURCE_TREE/src/qbase.pri)
-    else: VERSION = $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-
     PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
     DEFINES *= NDEBUG
 
@@ -67,7 +63,11 @@ CONFIG(standalone_package) {
 
 }
 
-!CONFIG(QTDIR_build) {
+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
 }

-- 
WebKit Debian packaging