[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[ossy at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 8f6d89dcb124bd250a049efdb353281f2d73369e
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 26 17:56:42 2011 +0000

    [Qt] Fix qt_minimal build
    https://bugs.webkit.org/show_bug.cgi?id=53172
    
    Reviewed by Andreas Kling.
    
    * Source/WebKit.pri:
    * Tools/QtTestBrowser/locationedit.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76694 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index fe7d46c..b7185b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-26  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Fix qt_minimal build
+        https://bugs.webkit.org/show_bug.cgi?id=53172
+
+        * Source/WebKit.pri:
+
 2011-01-25  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/Source/WebKit.pri b/Source/WebKit.pri
index ab8a6d5..e779020 100644
--- a/Source/WebKit.pri
+++ b/Source/WebKit.pri
@@ -105,8 +105,6 @@ symbian|maemo5|maemo6 {
 
 disable_uitools: DEFINES *= QT_NO_UITOOLS
 
-contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools
-
 # Disable a few warnings on Windows. The warnings are also
 # disabled in WebKitLibraries/win/tools/vsprops/common.vsprops
 win32-msvc*|wince*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -wd4996
@@ -139,3 +137,5 @@ CONFIG(qt_minimal) {
     DEFINES *= QT_NO_UNDOSTACK
     DEFINES *= QT_NO_XRENDER
 }
+
+contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 876981a..a8b46d7 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-26  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Fix qt_minimal build
+        https://bugs.webkit.org/show_bug.cgi?id=53172
+
+        * QtTestBrowser/locationedit.h:
+
 2011-01-26  Mansi Mithal  <mansi.mithal at nokia.com>
 
         Reviewed by Antonio Gomes.
diff --git a/Tools/QtTestBrowser/locationedit.h b/Tools/QtTestBrowser/locationedit.h
index 752497e..962b422 100644
--- a/Tools/QtTestBrowser/locationedit.h
+++ b/Tools/QtTestBrowser/locationedit.h
@@ -28,6 +28,8 @@
 #ifndef locationedit_h
 #define locationedit_h
 
+#include <qconfig.h>
+
 #ifndef QT_NO_INPUTDIALOG
 #include <QtGui>
 

-- 
WebKit Debian packaging