[Qt][WK2] Export QNetworkReply in the QtWebKit QML module.

[WebKit.git] / Source / WebKit.pro

diff --git a/Source/WebKit.pro b/Source/WebKit.pro
index 10bd8cf..741d476 100644 (file)
--- a/Source/WebKit.pro
+++ b/Source/WebKit.pro
@@ -8,15 +8,30 @@ include(WebKit.pri)
     exists($$PWD/JavaScriptCore/jsc.pro): SUBDIRS += JavaScriptCore/jsc.pro
 }
 
-webkit2:exists($$PWD/WebKit2/WebKit2.pro): SUBDIRS += WebKit2/WebKit2.pro
+webkit2 {
+    lessThan(QT_MAJOR_VERSION, 5) {
+        message("Building WebKit2 with Qt versions older than 5.0 is no longer supported.")
+        message("Read http://www.mail-archive.com/webkit-qt@lists.webkit.org/msg01674.html for more information.")
+        error("Aborting build.")
+    }
+    exists($$PWD/WebKit2/WebKit2.pro): SUBDIRS += WebKit2/WebKit2.pro
+}
 
 SUBDIRS += WebCore
 SUBDIRS += WebKit/qt/QtWebKit.pro
 
-webkit2:exists($$PWD/WebKit2/WebProcess.pro): SUBDIRS += WebKit2/WebProcess.pro
+webkit2 {
+    exists($$PWD/WebKit2/WebProcess.pro): SUBDIRS += WebKit2/WebProcess.pro
+    exists($$PWD/WebKit2/UIProcess/API/qt/tests): SUBDIRS += WebKit2/UIProcess/API/qt/tests
+    SUBDIRS += WebKit2/UIProcess/API/qt/qmlplugin
+}
 
-contains(QT_CONFIG, declarative) {
-    exists($$PWD/WebKit/qt/declarative): SUBDIRS += WebKit/qt/declarative
+exists($$PWD/WebKit/qt/declarative) {
+    lessThan(QT_MAJOR_VERSION, 5) {
+        contains(QT_CONFIG, declarative): SUBDIRS += WebKit/qt/declarative
+    } else {
+        contains(QT_CONFIG, qtquick1): SUBDIRS += WebKit/qt/declarative
+    }
 }
 
 exists($$PWD/WebKit/qt/tests): SUBDIRS += WebKit/qt/tests
@@ -29,6 +44,8 @@ build-qtscript {
 }
 
 symbian {
+    exists($$PWD/WebKit/qt/symbian/platformplugin): SUBDIRS += WebKit/qt/symbian/platformplugin
+
     # Forward the install target to WebCore. A workaround since INSTALLS is not implemented for symbian
     install.commands = $(MAKE) -C WebCore install
     QMAKE_EXTRA_TARGETS += install