[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 2be06666c83b577caa53a48f3631550397a17309
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 23 09:55:50 2010 +0000

    [Qt] Correct build problems while building QtWebKit inside Qt.
    https://bugs.webkit.org/show_bug.cgi?id=34975
    
    Reviewed by Laszlo Gombos.
    
    * WebCore.pro: Change the condition !standalone_package to !QTDIR_build
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55133 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 81dcd68..c6dfcb7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-23  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Correct build problems while building QtWebKit inside Qt.
+        https://bugs.webkit.org/show_bug.cgi?id=34975
+
+        * WebCore.pro: Change the condition !standalone_package to !QTDIR_build
+
 2010-02-23  Noam Rosenthal  <noam.rosenthal at nokia.com>
 
         Reviewed by Ariya Hidayat.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 97959cf..fd8d45c 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -47,8 +47,9 @@ 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 = 4.7.0
+    else: VERSION = $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 
     PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
     DEFINES *= NDEBUG
@@ -2704,19 +2705,15 @@ WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS
     QMAKE_EXTRA_TARGETS += install
 }
 
-# Qt will set the version for us when building in Qt's tree
-!CONFIG(QTDIR_build): VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-
-win32-*|wince* {
-    DLLDESTDIR = $$OUTPUT_DIR/bin
-    TARGET = $$qtLibraryTarget($$TARGET)
-
-    dlltarget.commands = $(COPY_FILE) $(DESTDIR_TARGET) $$[QT_INSTALL_BINS]
-    dlltarget.CONFIG = no_path
-    INSTALLS += dlltarget
-}
+!CONFIG(QTDIR_build) {
+    win32-*|wince* {
+        DLLDESTDIR = $$OUTPUT_DIR/bin
+        TARGET = $$qtLibraryTarget($$TARGET)
 
-!CONFIG(standalone_package) {
+        dlltarget.commands = $(COPY_FILE) $(DESTDIR_TARGET) $$[QT_INSTALL_BINS]
+        dlltarget.CONFIG = no_path
+        INSTALLS += dlltarget
+    }
 
     unix {
         CONFIG += create_pc create_prl

-- 
WebKit Debian packaging