Title: [99719] trunk/Tools
- Revision
- 99719
- Author
- [email protected]
- Date
- 2011-11-09 07:52:02 -0800 (Wed, 09 Nov 2011)
Log Message
[Qt] Disable use of QtUiTools if the library/module is not found
We rely on the lookup order of prf files to inject our own uitools.prf
that will verify that QtUiTools is in fact present before allowing the
CONFIG += uitools to have any effect.
Reviewed by Simon Hausmann.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (99718 => 99719)
--- trunk/Tools/ChangeLog 2011-11-09 15:46:49 UTC (rev 99718)
+++ trunk/Tools/ChangeLog 2011-11-09 15:52:02 UTC (rev 99719)
@@ -1,3 +1,17 @@
+2011-11-09 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Disable use of QtUiTools if the library/module is not found
+
+ We rely on the lookup order of prf files to inject our own uitools.prf
+ that will verify that QtUiTools is in fact present before allowing the
+ CONFIG += uitools to have any effect.
+
+ Reviewed by Simon Hausmann.
+
+ * DumpRenderTree/qt/DumpRenderTree.pro:
+ * QtTestBrowser/QtTestBrowser.pro:
+ * qmake/mkspecs/features/uitools.prf: Added.
+
2011-11-09 Simon Hausmann <[email protected]>
Unreviewed, rolling out r99701.
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro (99718 => 99719)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2011-11-09 15:46:49 UTC (rev 99718)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2011-11-09 15:52:02 UTC (rev 99719)
@@ -9,12 +9,7 @@
TARGET = DumpRenderTree
DESTDIR = $$ROOT_BUILD_DIR/bin
-haveQt(5):isEmpty(QT.uitools.name) {
- message("QtUiTools library not found. QWidget plugin loading will be disabled")
- DEFINES += QT_NO_UITOOLS
-} else {
- CONFIG += uitools
-}
+CONFIG += uitools
load(_javascript_core)
load(webcore)
Modified: trunk/Tools/QtTestBrowser/QtTestBrowser.pro (99718 => 99719)
--- trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2011-11-09 15:46:49 UTC (rev 99718)
+++ trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2011-11-09 15:52:02 UTC (rev 99719)
@@ -30,17 +30,8 @@
fpstimer.h \
cookiejar.h
-haveQt(5) {
- !isEmpty(QT.uitools.name): CONFIG += uitools
-} else {
- libraryName = $$fromfile($$[QT_INSTALL_LIBS]/libQtUiTools.prl, QMAKE_PRL_TARGET)
- !isEmpty(libraryName):exists($$[QT_INSTALL_LIBS]/$$libraryName): CONFIG += uitools
-}
-!CONFIG(uitools) {
- message("QtUiTools library not found. QWidget plugin loading will be disabled")
- DEFINES *= QT_NO_UITOOLS
-}
+CONFIG += uitools
load(webcore)
Added: trunk/Tools/qmake/mkspecs/features/uitools.prf (0 => 99719)
--- trunk/Tools/qmake/mkspecs/features/uitools.prf (rev 0)
+++ trunk/Tools/qmake/mkspecs/features/uitools.prf 2011-11-09 15:52:02 UTC (rev 99719)
@@ -0,0 +1,23 @@
+# -------------------------------------------------------------------
+# This file ensures that QtUiTools is available before including the
+# feature.
+#
+# See 'Tools/qmake/README' for an overview of the build system
+# -------------------------------------------------------------------
+
+# Disable by default
+CONFIG -= uitools
+
+haveQt(5) {
+ !isEmpty(QT.uitools.name): CONFIG += uitools
+} else {
+ # 4.x
+ libraryName = $$fromfile($$[QT_INSTALL_LIBS]/libQtUiTools.prl, QMAKE_PRL_TARGET)
+ !isEmpty(libraryName):exists($$[QT_INSTALL_LIBS]/$$libraryName): CONFIG += uitools
+}
+
+CONFIG(uitools):load(uitools)
+else {
+ !build_pass: message("QtUiTools library not found. QWidget plugin loading will be disabled")
+ DEFINES *= QT_NO_UITOOLS
+}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
