Don't link QtWebKit against libQtXml when building against Qt 4.4.
authorhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Jan 2008 10:01:39 +0000 (10:01 +0000)
committerhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Jan 2008 10:01:39 +0000 (10:01 +0000)
This is not necessary anymore since QXmlStream has been moved into QtCore.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29563 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/WebCore.pro

index 1c9788858e6982d16c9f285a34e7d43399c084be..6d20b17b5f2a269d0abec5721822b8cda9f77b14 100644 (file)
@@ -1,3 +1,13 @@
+2008-01-17  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Holger.
+
+        Don't link QtWebKit against libQtXml when building against Qt 4.4.
+
+        This is not necessary anymore since QXmlStream has been moved into QtCore.
+
+        * WebCore.pro:
+
 2008-01-17  HÃ¥vard Wall  <hwall@trolltech.com>
 
         Reviewed by Simon Hausmann <hausmann@webkit.org>.
index 555c8ef67b588055447f6289e69fa56bc219cdde..d6d39047e76ce5bb4477e8f451f86ba41fe481ea 100644 (file)
@@ -204,7 +204,8 @@ INCLUDEPATH +=  $$PWD \
                 $$PWD/platform/image-decoders \
                 $$PWD/plugins
 
-QT += network xml
+QT += network
+lessThan(QT_MINOR_VERSION, 4): QT += xml
 
 QMAKE_EXTRA_TARGETS += generated_files