diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-06 13:29:43 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-10 15:38:50 +0200 |
| commit | 2b23baa7665f49b05ea3bab949a6324c491eb79f (patch) | |
| tree | 4d5ee981ef34d491108854ac4e4395a9515174c5 | |
| parent | 5b1c84b22b82d166b8c76f33a5e5141aca207381 (diff) | |
Support building QtTestBrowser without QtTestSupportv5.4.0-beta1
Use the same flags for QtTestBrowser that MiniBrowser uses to build
without webkit's QtTestSupport.
Change-Id: I0b31b1253b5014393a472286ffc6674efc64e753
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
| -rw-r--r-- | Tools/QtTestBrowser/qttestbrowser.cpp | 12 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/configure.prf | 6 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/features.prf | 2 |
3 files changed, 14 insertions, 6 deletions
diff --git a/Tools/QtTestBrowser/qttestbrowser.cpp b/Tools/QtTestBrowser/qttestbrowser.cpp index ee1e7d4fa..b9fa59399 100644 --- a/Tools/QtTestBrowser/qttestbrowser.cpp +++ b/Tools/QtTestBrowser/qttestbrowser.cpp @@ -31,11 +31,16 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "config.h" + #include "DumpRenderTreeSupportQt.h" -#include "QtTestSupport.h" #include "launcherwindow.h" #include "urlloader.h" +#if HAVE(QTTESTSUPPORT) +#include "QtTestSupport.h" +#endif + WindowOptions windowOptions; #include <QApplication> @@ -149,7 +154,9 @@ void LauncherApplication::handleUserOptions() << "[-offline-storage-database-enabled]" << "[-offline-web-application-cache-enabled]" << "[-set-offline-storage-default-quota maxSize]" +#if HAVE(QTTESTSUPPORT) << "[-use-test-fonts]" +#endif << "[-print-loaded-urls]" << "URLs"; appQuit(0); @@ -245,9 +252,10 @@ void LauncherApplication::handleUserOptions() windowOptions.useQOpenGLWidgetViewport = true; } - +#if HAVE(QTTESTSUPPORT) if (args.contains("-use-test-fonts")) WebKit::QtTestSupport::initializeTestFonts(); +#endif if (args.contains("-print-loaded-urls")) windowOptions.printLoadedUrls = true; diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf index d30e668be..3f64452e5 100644 --- a/Tools/qmake/mkspecs/features/configure.prf +++ b/Tools/qmake/mkspecs/features/configure.prf @@ -85,9 +85,6 @@ defineReplace(configEnabled) { # command line options defineTest(finalizeConfigure) { - # Sanitize clashing options - santizeFeatures() - # Sanitize build options !qtHaveModule(testlib) { CONFIGURE_WARNINGS += "Missing QtTest module, disabling DumpRenderTree, WebKitTestRunner and tests" @@ -109,6 +106,9 @@ defineTest(finalizeConfigure) { WEBKIT_CONFIG -= build_webkit2 build_minibrowser build_wtr } + # Sanitize clashing options + santizeFeatures() + print_defaults { log(DEFINES: $$configDefines()$${EOL}) error(Done computing defaults) diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index 46278a610..62791e505 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -176,7 +176,7 @@ defineTest(santizeFeatures) { # VideoTrack requires video !enable?(video): WEBKIT_CONFIG -= video_track - # Minibrowser must be able to query for QtTestSupport + # QtTestBrowser and MiniBrowser must be able to query for QtTestSupport build?(qttestsupport): WEBKIT_CONFIG += have_qttestsupport # Accelerated 2D canvas uses 3D graphics support. |