Changeset 125377 in webkit

Timestamp:

Aug 12, 2012 9:52:54 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Make it possible to build without QtTest/QtPrintSupport
​https://bugs.webkit.org/show_bug.cgi?id=93492

Patch by Loïc Yhuel <​loic.yhuel@softathome.com> on 2012-08-12
Reviewed by Tor Arne Vestbø.

.:

• Source/QtWebKit.pro: Disable tests if no testlib

Source/WebKit:

• WebKit1.pri: Optional printsupport

Source/WebKit/qt:

• Api/qwebframe.cpp:

(QWebFrame::print): Does nothing if no printsupport

• Api/qwebview.cpp:

(QWebView::print): Does nothing if no printsupport

Tools:

• DumpRenderTree/qt/DumpRenderTree.pro: Optional printsupport
• DumpRenderTree/qt/DumpRenderTreeQt.cpp:

(WebCore):
(WebCore::DumpRenderTree::dryRunPrint): Does nothing if no printsupport

• QtTestBrowser/QtTestBrowser.pro: Optional printsupport
• QtTestBrowser/launcherwindow.cpp:

(LauncherWindow::createChrome): No print menu if no printsupport
(LauncherWindow::print): Does nothing if no printsupport

• QtTestBrowser/launcherwindow.h:
• Tools.pro: Disable DRT/WTR if QtTest not present
• qmake/mkspecs/features/default_pre.prf: printsupport no more mandatory
• qmake/mkspecs/features/features.prf: Qt module availability tests

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/QtWebKit.pro (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebKit1.pri (modified) (1 diff)
• Source/WebKit/qt/Api/qwebframe.cpp (modified) (3 diffs)
• Source/WebKit/qt/Api/qwebview.cpp (modified) (2 diffs)
• Source/WebKit/qt/ChangeLog (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/qt/DumpRenderTree.pro (modified) (1 diff)
• Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (modified) (3 diffs)
• Tools/QtTestBrowser/QtTestBrowser.pro (modified) (1 diff)
• Tools/QtTestBrowser/launcherwindow.cpp (modified) (3 diffs)
• Tools/QtTestBrowser/launcherwindow.h (modified) (1 diff)
• Tools/Tools.pro (modified) (2 diffs)
• Tools/qmake/mkspecs/features/default_pre.prf (modified) (1 diff)
• Tools/qmake/mkspecs/features/features.prf (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2012-08-12  Loïc Yhuel  <loic.yhuel@softathome.com>
+
+        [Qt] Make it possible to build without QtTest/QtPrintSupport
+        https://bugs.webkit.org/show_bug.cgi?id=93492
+
+        Reviewed by Tor Arne Vestbø.
+
+        * Source/QtWebKit.pro: Disable tests if no testlib
+
 2012-08-10  Rob Buis  <rbuis@rim.com>
 

trunk/Source/QtWebKit.pro

@@ -27 +27 @@
 
 !no_webkit1 {
-    tests.file = tests.pri
-    SUBDIRS += tests
+    contains(DEFINES, HAVE_QTTESTLIB=1) {
+        tests.file = tests.pri
+        SUBDIRS += tests
+    }
 
     examples.file = WebKit/qt/examples/examples.pro

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2012-08-12  Loïc Yhuel  <loic.yhuel@softathome.com>
+
+        [Qt] Make it possible to build without QtTest/QtPrintSupport
+        https://bugs.webkit.org/show_bug.cgi?id=93492
+
+        Reviewed by Tor Arne Vestbø.
+
+        * WebKit1.pri: Optional printsupport
+
 2012-08-10  Joshua Netterfield  <jnetterfield@rim.com>
 

trunk/Source/WebKit/WebKit1.pri

@@ -40 +40 @@
 plugin_backend_xlib: PKGCONFIG += x11
 
-QT += network widgets printsupport
+QT += network widgets
 contains(DEFINES, HAVE_QTQUICK=1): QT += quick
+contains(DEFINES, HAVE_QTPRINTSUPPORT=1): QT += printsupport
 
 contains(DEFINES, WTF_USE_TEXTURE_MAPPER_GL=1)|contains(DEFINES, ENABLE_WEBGL=1) {

trunk/Source/WebKit/qt/Api/qwebframe.cpp

@@ -94 +94 @@
 #include <qfileinfo.h>
 #include <qpainter.h>
+#if HAVE(QTPRINTSUPPORT)
 #include <qprinter.h>
+#endif
 #include <qregion.h>
 #include <qnetworkrequest.h>
@@ -1428 +1430 @@
 void QWebFrame::print(QPrinter *printer) const
 {
+#if HAVE(QTPRINTSUPPORT)
     QPainter painter;
     if (!painter.begin(printer))
@@ -1515 +1518 @@
 
     printContext.end();
+#endif // HAVE(PRINTSUPPORT)
 }
 #endif // QT_NO_PRINTER

trunk/Source/WebKit/qt/Api/qwebview.cpp

@@ -31 +31 @@
 #include "qevent.h"
 #include "qpainter.h"
+#if HAVE(QTPRINTSUPPORT)
 #include "qprinter.h"
+#endif
 #include "qdir.h"
 #include "qfile.h"
@@ -747 +749 @@
 void QWebView::print(QPrinter *printer) const
 {
-#ifndef QT_NO_PRINTER
+#if !defined(QT_NO_PRINTER) && HAVE(QTPRINTSUPPORT)
     page()->mainFrame()->print(printer);
 #endif

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2012-08-12  Loïc Yhuel  <loic.yhuel@softathome.com>
+
+        [Qt] Make it possible to build without QtTest/QtPrintSupport
+        https://bugs.webkit.org/show_bug.cgi?id=93492
+
+        Reviewed by Tor Arne Vestbø.
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::print): Does nothing if no printsupport
+        * Api/qwebview.cpp:
+        (QWebView::print): Does nothing if no printsupport
+
 2012-08-11  Pierre Rossi  <pierre.rossi@gmail.com>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2012-08-12  Loïc Yhuel  <loic.yhuel@softathome.com>
+
+        [Qt] Make it possible to build without QtTest/QtPrintSupport
+        https://bugs.webkit.org/show_bug.cgi?id=93492
+
+        Reviewed by Tor Arne Vestbø.
+
+        * DumpRenderTree/qt/DumpRenderTree.pro: Optional printsupport
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore):
+        (WebCore::DumpRenderTree::dryRunPrint): Does nothing if no printsupport
+        * QtTestBrowser/QtTestBrowser.pro: Optional printsupport
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::createChrome): No print menu if no printsupport
+        (LauncherWindow::print): Does nothing if no printsupport
+        * QtTestBrowser/launcherwindow.h:
+        * Tools.pro: Disable DRT/WTR if QtTest not present
+        * qmake/mkspecs/features/default_pre.prf: printsupport no more mandatory
+        * qmake/mkspecs/features/features.prf: Qt module availability tests
+
 2012-08-12  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro

@@ -19 +19 @@
     $${ROOT_WEBKIT_DIR}/Source/WTF
 
-QT = core gui network testlib webkit widgets printsupport
+QT = core gui network testlib webkit widgets
+contains(DEFINES, HAVE_QTPRINTSUPPORT=1): QT += printsupport
 macx: QT += xml
 

trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -58 +58 @@
 #include <QPaintDevice>
 #include <QPaintEngine>
-#ifndef QT_NO_PRINTER
+#if !defined(QT_NO_PRINTER) && HAVE(QTPRINTSUPPORT)
 #include <QPrinter>
 #endif
@@ -111 +111 @@
 
 
-#ifndef QT_NO_PRINTER
+#if !defined(QT_NO_PRINTER) && HAVE(QTPRINTSUPPORT)
 class NullPrinter : public QPrinter {
 public:
@@ -501 +501 @@
 void DumpRenderTree::dryRunPrint(QWebFrame* frame)
 {
-#ifndef QT_NO_PRINTER
+#if !defined(QT_NO_PRINTER) && HAVE(QTPRINTSUPPORT)
     NullPrinter printer;
     frame->print(&printer);

trunk/Tools/QtTestBrowser/QtTestBrowser.pro

@@ -43 +43 @@
 DESTDIR = $$ROOT_BUILD_DIR/bin
 
-QT += network webkit printsupport widgets
+QT += network webkit widgets
+contains(DEFINES, HAVE_QTPRINTSUPPORT=1): QT += printsupport
 
 macx:QT += xml

trunk/Tools/QtTestBrowser/launcherwindow.cpp

@@ -52 +52 @@
 #include <QMenuBar>
 #endif
+#if !defined(QT_NO_PRINTER) && HAVE(QTPRINTSUPPORT)
+#include <QPrintPreviewDialog>
+#endif
 #include <QSlider>
 #include <QSplitter>
@@ -238 +241 @@
     fileMenu->addSeparator();
     fileMenu->addAction("Take Screen Shot...", this, SLOT(screenshot()));
-#ifndef QT_NO_PRINTER
+#if !defined(QT_NO_PRINTER) && HAVE(QTPRINTSUPPORT)
     fileMenu->addAction(tr("Print..."), this, SLOT(print()), QKeySequence::Print);
 #endif
@@ -725 +728 @@
 void LauncherWindow::print()
 {
-#if !defined(QT_NO_PRINTER)
+#if !defined(QT_NO_PRINTER) && HAVE(QTPRINTSUPPORT)
     QPrintPreviewDialog dlg(this);
     connect(&dlg, SIGNAL(paintRequested(QPrinter*)),

trunk/Tools/QtTestBrowser/launcherwindow.h

@@ -40 +40 @@
 #endif
 
-#if !defined(QT_NO_PRINTER)
-#include <QPrintPreviewDialog>
-#endif
-
 #include <QDebug>
 

trunk/Tools/Tools.pro

@@ -10 +10 @@
 !no_webkit1 {
     SUBDIRS += QtTestBrowser/QtTestBrowser.pro
-    SUBDIRS += DumpRenderTree/qt/DumpRenderTree.pro
+    contains(DEFINES, HAVE_QTTESTLIB=1): SUBDIRS += DumpRenderTree/qt/DumpRenderTree.pro
     SUBDIRS += DumpRenderTree/qt/ImageDiff.pro
 }
@@ -16 +16 @@
 !no_webkit2 {
     # WTR's InjectedBundle depends currently on WK1's DumpRenderTreeSupport
-    !no_webkit1:contains(DEFINES, HAVE_QTQUICK=1): SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
+    !no_webkit1:contains(DEFINES, HAVE_QTQUICK=1):contains(DEFINES, HAVE_QTTESTLIB=1): SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
 
     contains(DEFINES, HAVE_QTQUICK=1): SUBDIRS += MiniBrowser/qt/MiniBrowser.pro

trunk/Tools/qmake/mkspecs/features/default_pre.prf

@@ -79 +79 @@
 !haveQt(5):!recursive_include: error("Building WebKit with Qt versions older than 5.0 is not supported.")
 
-!haveQtModule(widgets)|!haveQtModule(printsupport) {
-    root_project_file: message("WebKit1 requires the QtWidgets and QtPrintSupport modules. Disabling WebKit1.")
+!haveQtModule(widgets) {
+    root_project_file: message("WebKit1 requires the QtWidgets module. Disabling WebKit1.")
     CONFIG += no_webkit1
 }

trunk/Tools/qmake/mkspecs/features/features.prf

@@ -47 +47 @@
 !contains(DEFINES, HAVE_QTQUICK=.) {
     haveQtModule(quick): DEFINES += HAVE_QTQUICK=1
+}
+
+!contains(DEFINES, HAVE_QTPRINTSUPPORT=.) {
+    haveQtModule(printsupport): DEFINES += HAVE_QTPRINTSUPPORT=1
+}
+
+!contains(DEFINES, HAVE_QTTESTLIB=.) {
+    haveQtModule(testlib) {
+        DEFINES += HAVE_QTTESTLIB=1
+    } else {
+        message("Missing QtTest module, disabling DumpRenderTree, WebKitTestRunner and tests")
+    }
 }