Title: [99690] trunk/Tools
- Revision
- 99690
- Author
- ves...@webkit.org
- Date
- 2011-11-09 05:03:58 -0800 (Wed, 09 Nov 2011)
Log Message
[Qt] Detect presence of QtUiTools and enable it only when available
The disable_uitools option was a workaround for missing detection.
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (99689 => 99690)
--- trunk/Tools/ChangeLog 2011-11-09 13:02:03 UTC (rev 99689)
+++ trunk/Tools/ChangeLog 2011-11-09 13:03:58 UTC (rev 99690)
@@ -1,5 +1,17 @@
2011-11-09 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+ [Qt] Detect presence of QtUiTools and enable it only when available
+
+ The disable_uitools option was a workaround for missing detection.
+
+ Reviewed by Simon Hausmann.
+
+ * QtTestBrowser/QtTestBrowser.pro:
+ * qmake/mkspecs/features/default_post.prf:
+ * qmake/mkspecs/features/default_pre.prf:
+
+2011-11-09 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
[Qt] Don't override config for the build_pass of debug_and_release
Qmake will parse the profile once for each configuration (debug and
Modified: trunk/Tools/QtTestBrowser/QtTestBrowser.pro (99689 => 99690)
--- trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2011-11-09 13:02:03 UTC (rev 99689)
+++ trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2011-11-09 13:03:58 UTC (rev 99690)
@@ -30,13 +30,18 @@
fpstimer.h \
cookiejar.h
-greaterThan(QT_MAJOR_VERSION, 4):isEmpty(QT.uitools.name) {
- message("QtUiTools library not found. QWidget plugin loading will be disabled")
- DEFINES += QT_NO_UITOOLS
+haveQt(5) {
+ !isEmpty(QT.uitools.name): CONFIG += uitools
} else {
- CONFIG += uitools
+ 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
+}
+
load(webcore)
CONFIG += qtwebkit
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (99689 => 99690)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2011-11-09 13:02:03 UTC (rev 99689)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2011-11-09 13:03:58 UTC (rev 99690)
@@ -63,11 +63,6 @@
contains(_javascript_CORE_JIT, yes): DEFINES+=ENABLE_JIT=1
contains(_javascript_CORE_JIT, no): DEFINES+=ENABLE_JIT=0
-disable_uitools {
- DEFINES *= QT_NO_UITOOLS
- CONFIG -= uitools
-}
-
# Template configurations
contains(TEMPLATE, derived) {
# A (mostly) no-op template
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (99689 => 99690)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2011-11-09 13:02:03 UTC (rev 99689)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2011-11-09 13:03:58 UTC (rev 99690)
@@ -103,5 +103,3 @@
# Set some defaults for specific platforms
CONFIG += include_webinspector
-
-*sh4*: CONFIG += disable_uitools
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
