Title: [134200] trunk
- Revision
- 134200
- Author
- zeno.albis...@digia.com
- Date
- 2012-11-12 03:07:51 -0800 (Mon, 12 Nov 2012)
Log Message
[Qt] MiniBrowser should not strongly depend on QtTestSupport.
https://bugs.webkit.org/show_bug.cgi?id=101775
Introducing HAVE(QTTESTSUPPORT) to allow building
MiniBrowser without QtTestSupport.
This is necessary when using a production build.
Reviewed by Tor Arne Vestbø.
Source/WebCore:
* Target.pri:
* platform/qt/QtTestSupport.h:
Tools:
* MiniBrowser/qt/MiniBrowserApplication.cpp:
(MiniBrowserApplication::handleUserOptions):
* qmake/mkspecs/features/configure.prf:
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (134199 => 134200)
--- trunk/Source/WebCore/ChangeLog 2012-11-12 10:13:35 UTC (rev 134199)
+++ trunk/Source/WebCore/ChangeLog 2012-11-12 11:07:51 UTC (rev 134200)
@@ -1,3 +1,17 @@
+2012-11-12 Zeno Albisser <z...@webkit.org>
+
+ [Qt] MiniBrowser should not strongly depend on QtTestSupport.
+ https://bugs.webkit.org/show_bug.cgi?id=101775
+
+ Introducing HAVE(QTTESTSUPPORT) to allow building
+ MiniBrowser without QtTestSupport.
+ This is necessary when using a production build.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Target.pri:
+ * platform/qt/QtTestSupport.h:
+
2012-11-12 Pavel Feldman <pfeld...@chromium.org>
Web Inspector: wasShown is called twice when show() is called from within wasShown
Modified: trunk/Source/WebCore/Target.pri (134199 => 134200)
--- trunk/Source/WebCore/Target.pri 2012-11-12 10:13:35 UTC (rev 134199)
+++ trunk/Source/WebCore/Target.pri 2012-11-12 11:07:51 UTC (rev 134200)
@@ -4079,7 +4079,7 @@
}
}
-if(build?(drt)|build?(wtr)) {
+build?(qttestsupport) {
HEADERS += platform/qt/QtTestSupport.h
SOURCES += platform/qt/QtTestSupport.cpp
}
Modified: trunk/Tools/ChangeLog (134199 => 134200)
--- trunk/Tools/ChangeLog 2012-11-12 10:13:35 UTC (rev 134199)
+++ trunk/Tools/ChangeLog 2012-11-12 11:07:51 UTC (rev 134200)
@@ -1,3 +1,19 @@
+2012-11-12 Zeno Albisser <z...@webkit.org>
+
+ [Qt] MiniBrowser should not strongly depend on QtTestSupport.
+ https://bugs.webkit.org/show_bug.cgi?id=101775
+
+ Introducing HAVE(QTTESTSUPPORT) to allow building
+ MiniBrowser without QtTestSupport.
+ This is necessary when using a production build.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * MiniBrowser/qt/MiniBrowserApplication.cpp:
+ (MiniBrowserApplication::handleUserOptions):
+ * qmake/mkspecs/features/configure.prf:
+ * qmake/mkspecs/features/features.prf:
+
2012-11-11 Kangil Han <kangil....@samsung.com>
Change build congratulation message in EFL
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (134199 => 134200)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2012-11-12 10:13:35 UTC (rev 134199)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2012-11-12 11:07:51 UTC (rev 134200)
@@ -26,10 +26,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "config.h"
+
#include "MiniBrowserApplication.h"
#include "BrowserWindow.h"
+#if HAVE(QTTESTSUPPORT)
#include "QtTestSupport.h"
+#endif
#include "private/qquickwebview_p.h"
#include "utils.h"
#include <QRegExp>
@@ -334,8 +338,10 @@
m_windowOptions.setRequestedWindowSize(QSize(list.at(0).toInt(), list.at(1).toInt()));
}
+#if HAVE(QTTESTSUPPORT)
if (takeOptionFlag(&args, QStringLiteral("--use-test-fonts")))
WebKit::QtTestSupport::initializeTestFonts();
+#endif
if (args.contains("-r")) {
QString listFile = takeOptionValue(&args, "-r");
Modified: trunk/Tools/qmake/mkspecs/features/configure.prf (134199 => 134200)
--- trunk/Tools/qmake/mkspecs/features/configure.prf 2012-11-12 10:13:35 UTC (rev 134199)
+++ trunk/Tools/qmake/mkspecs/features/configure.prf 2012-11-12 11:07:51 UTC (rev 134200)
@@ -17,7 +17,8 @@
build_imagediff \
build_test_npapi \
build_testbrowser \
- build_minibrowser
+ build_minibrowser \
+ build_qttestsupport
defineTest(runConfigure) {
!webkit_configured:!print_defaults {
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (134199 => 134200)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-11-12 10:13:35 UTC (rev 134199)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-11-12 11:07:51 UTC (rev 134200)
@@ -134,6 +134,10 @@
# Slider Touch is sensible to use when compiling WebKit2
enable?(touch_events): WEBKIT_CONFIG += touch_slider
+
+ # Minibrowser must be able to query for QtTestSupport
+ build?(qttestsupport): WEBKIT_CONFIG += have_qttestsupport
+
# ---------------- Sanitize features -------------------
export(WEBKIT_CONFIG)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
