Title: [155433] trunk
- Revision
- 155433
- Author
- [email protected]
- Date
- 2013-09-10 06:11:46 -0700 (Tue, 10 Sep 2013)
Log Message
[Qt] make use of qtHaveModule()
https://bugs.webkit.org/show_bug.cgi?id=121090
Reviewed by Jocelyn Turcotte.
Use qtHaveModule instead of our own haveQtModule.
Source/WebKit2:
* WebProcess.pro:
Tools:
* QtTestBrowser/QtTestBrowser.pro:
* qmake/mkspecs/features/configure.prf:
* qmake/mkspecs/features/features.prf:
* qmake/mkspecs/features/functions.prf:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (155432 => 155433)
--- trunk/Source/WebKit2/ChangeLog 2013-09-10 11:06:06 UTC (rev 155432)
+++ trunk/Source/WebKit2/ChangeLog 2013-09-10 13:11:46 UTC (rev 155433)
@@ -1,3 +1,15 @@
+2013-09-10 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt] make use of qtHaveModule()
+ https://bugs.webkit.org/show_bug.cgi?id=121090
+
+ Reviewed by Jocelyn Turcotte.
+ Patch by Oswald Buddenhagen <[email protected]>
+
+ Use qtHaveModule instead of our own haveQtModule.
+
+ * WebProcess.pro:
+
2013-09-10 Carlos Garcia Campos <[email protected]>
[GTK] /webkit2/WebKitWebView/default-menu fails when GtkSettings:gtk-show-input-method-menu is disabled
Modified: trunk/Source/WebKit2/WebProcess.pro (155432 => 155433)
--- trunk/Source/WebKit2/WebProcess.pro 2013-09-10 11:06:06 UTC (rev 155432)
+++ trunk/Source/WebKit2/WebProcess.pro 2013-09-10 13:11:46 UTC (rev 155433)
@@ -18,7 +18,7 @@
QT += network webkit
macx: QT += xml
-haveQtModule(widgets): QT += widgets webkitwidgets
+qtHaveModule(widgets): QT += widgets webkitwidgets
build?(webkit1): DEFINES += HAVE_WEBKIT1
Modified: trunk/Tools/ChangeLog (155432 => 155433)
--- trunk/Tools/ChangeLog 2013-09-10 11:06:06 UTC (rev 155432)
+++ trunk/Tools/ChangeLog 2013-09-10 13:11:46 UTC (rev 155433)
@@ -1,3 +1,18 @@
+2013-09-10 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt] make use of qtHaveModule()
+ https://bugs.webkit.org/show_bug.cgi?id=121090
+
+ Reviewed by Jocelyn Turcotte.
+ Patch by Oswald Buddenhagen <[email protected]>
+
+ Use qtHaveModule instead of our own haveQtModule.
+
+ * QtTestBrowser/QtTestBrowser.pro:
+ * qmake/mkspecs/features/configure.prf:
+ * qmake/mkspecs/features/features.prf:
+ * qmake/mkspecs/features/functions.prf:
+
2013-09-10 Michał Pakuła vel Rutka <[email protected]>
Unreviewed. Add myself as a committer.
Modified: trunk/Tools/QtTestBrowser/QtTestBrowser.pro (155432 => 155433)
--- trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2013-09-10 11:06:06 UTC (rev 155432)
+++ trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2013-09-10 13:11:46 UTC (rev 155433)
@@ -48,7 +48,7 @@
have?(FONTCONFIG): PKGCONFIG += fontconfig
-contains(QT_CONFIG, opengl) {
+qtHaveModule(opengl) {
QT += opengl
DEFINES += QT_CONFIGURED_WITH_OPENGL
}
Modified: trunk/Tools/qmake/mkspecs/features/configure.prf (155432 => 155433)
--- trunk/Tools/qmake/mkspecs/features/configure.prf 2013-09-10 11:06:06 UTC (rev 155432)
+++ trunk/Tools/qmake/mkspecs/features/configure.prf 2013-09-10 13:11:46 UTC (rev 155433)
@@ -57,7 +57,7 @@
# to determine which pro-files to include. The remaining sanitazion
# is done when finalizing configure.
- !haveQtModule(widgets) {
+ !qtHaveModule(widgets) {
CONFIGURE_WARNINGS += "Missing QtWidgets module, disabling WebKit1"
WEBKIT_CONFIG -= build_webkit1
}
@@ -89,7 +89,7 @@
santizeFeatures()
# Sanitize build options
- !haveQtModule(testlib) {
+ !qtHaveModule(testlib) {
CONFIGURE_WARNINGS += "Missing QtTest module, disabling DumpRenderTree, WebKitTestRunner and tests"
WEBKIT_CONFIG -= build_drt build_wtr build_tests
}
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (155432 => 155433)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2013-09-10 11:06:06 UTC (rev 155432)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2013-09-10 13:11:46 UTC (rev 155433)
@@ -31,14 +31,14 @@
# Please note: static feature defaults go in features.pri
#
- haveQtModule(quick): WEBKIT_CONFIG += have_qtquick
+ qtHaveModule(quick): WEBKIT_CONFIG += have_qtquick
else: CONFIGURE_WARNINGS += "QtQuick module not found, QML APIs will not be built"
- haveQtModule(printsupport): WEBKIT_CONFIG += have_qtprintsupport
- haveQtModule(widgets): WEBKIT_CONFIG += have_qstyle
- haveQtModule(testlib): WEBKIT_CONFIG += have_qttestlib
- haveQtModule(location): WEBKIT_CONFIG += have_qtlocation
- haveQtModule(sensors): WEBKIT_CONFIG += have_qtsensors
+ qtHaveModule(printsupport): WEBKIT_CONFIG += have_qtprintsupport
+ qtHaveModule(widgets): WEBKIT_CONFIG += have_qstyle
+ qtHaveModule(testlib): WEBKIT_CONFIG += have_qttestlib
+ qtHaveModule(location): WEBKIT_CONFIG += have_qtlocation
+ qtHaveModule(sensors): WEBKIT_CONFIG += have_qtsensors
config_libxml2: WEBKIT_CONFIG += use_libxml2
config_libxslt: WEBKIT_CONFIG += xslt
@@ -116,7 +116,7 @@
}
}
- !enable?(video):haveQtModule(multimediawidgets) {
+ !enable?(video):qtHaveModule(multimediawidgets) {
WEBKIT_CONFIG += video use_qt_multimedia
}
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (155432 => 155433)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2013-09-10 11:06:06 UTC (rev 155432)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2013-09-10 13:11:46 UTC (rev 155433)
@@ -195,14 +195,6 @@
return(true)
}
-defineTest(haveQtModule) {
- unset(module)
- module = $$1
-
- haveQt(5):!isEmpty(QT.$${module}.name): return(true)
- return(false)
-}
-
defineTest(programExistsInPath) {
win32: program = $${1}.exe
else: program = $$1
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
