Title: [109909] trunk/Tools
- Revision
- 109909
- Author
- [email protected]
- Date
- 2012-03-06 05:25:21 -0800 (Tue, 06 Mar 2012)
Log Message
[Qt] Revert r109900, it was completly busted
HAVE_FOO does _not_ have a WTF_ prefix, go figure.
We still leave in the HAVE(FOO) in QtInitializeTestFonts.cpp, instead
of manual define checks.
Reviewed by Ossy.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (109908 => 109909)
--- trunk/Tools/ChangeLog 2012-03-06 13:15:06 UTC (rev 109908)
+++ trunk/Tools/ChangeLog 2012-03-06 13:25:21 UTC (rev 109909)
@@ -1,3 +1,19 @@
+2012-03-06 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Revert r109900, it was completly busted
+
+ HAVE_FOO does _not_ have a WTF_ prefix, go figure.
+
+ We still leave in the HAVE(FOO) in QtInitializeTestFonts.cpp, instead
+ of manual define checks.
+
+ Reviewed by Ossy.
+
+ * DumpRenderTree/qt/DumpRenderTree.pro:
+ * QtTestBrowser/QtTestBrowser.pro:
+ * WebKitTestRunner/InjectedBundle/Target.pri:
+ * qmake/mkspecs/features/features.prf:
+
2012-03-05 Tor Arne Vestbø <[email protected]>
[Qt] Use config test to determine if the compiler supports -MD
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro (109908 => 109909)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-03-06 13:15:06 UTC (rev 109908)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-03-06 13:25:21 UTC (rev 109909)
@@ -23,7 +23,7 @@
macx: QT += xml
haveQt(5): QT += widgets printsupport
-contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
HEADERS += \
$$PWD/../WorkQueue.h \
Modified: trunk/Tools/QtTestBrowser/QtTestBrowser.pro (109908 => 109909)
--- trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2012-03-06 13:15:06 UTC (rev 109908)
+++ trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2012-03-06 13:25:21 UTC (rev 109909)
@@ -50,7 +50,7 @@
macx:QT += xml
haveQt(5): QT += printsupport widgets
-contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
contains(QT_CONFIG, opengl) {
QT += opengl
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (109908 => 109909)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-03-06 13:15:06 UTC (rev 109908)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-03-06 13:25:21 UTC (rev 109909)
@@ -58,7 +58,7 @@
CONFIG += plugin qtwebkit rpath
-contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
INCLUDEPATH += \
$$PWD/.. \
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (109908 => 109909)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-03-06 13:15:06 UTC (rev 109908)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-03-06 13:25:21 UTC (rev 109909)
@@ -45,12 +45,12 @@
# We need fontconfig to set up the test fonts for DumpRenderTree and WebKitTestRunner.
haveQt(5) {
contains(config_test_fontconfig, yes):!mac {
- DEFINES += WTF_HAVE_FONTCONFIG=1
+ DEFINES += HAVE_FONTCONFIG=1
}
} else {
# Qt 4
unix:!mac:!embedded {
- DEFINES += WTF_HAVE_FONTCONFIG=1
+ DEFINES += HAVE_FONTCONFIG=1
}
}
@@ -137,7 +137,7 @@
}
# QStyle detection
-haveQt(4)|!isEmpty(QT.widgets.name): DEFINES += WTF_HAVE_QSTYLE=1
+haveQt(4)|!isEmpty(QT.widgets.name): DEFINES += HAVE_QSTYLE=1
# WebGL support
contains(QT_CONFIG, opengl):!win32-* {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
