Diff
Modified: trunk/Tools/ChangeLog (109899 => 109900)
--- trunk/Tools/ChangeLog 2012-03-06 12:11:05 UTC (rev 109899)
+++ trunk/Tools/ChangeLog 2012-03-06 12:15:41 UTC (rev 109900)
@@ -1,5 +1,19 @@
2012-03-06 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+ [Qt] Use correct define names for HAVE(FOO) style optional dependencies
+
+ Reviewed by Simon Hausmann.
+ Reviewed by Ossy.
+
+ * DumpRenderTree/qt/DumpRenderTree.pro:
+ * DumpRenderTree/qt/QtInitializeTestFonts.cpp:
+ (WebKit::initializeTestFonts):
+ * QtTestBrowser/QtTestBrowser.pro:
+ * WebKitTestRunner/InjectedBundle/Target.pri:
+ * qmake/mkspecs/features/features.prf:
+
+2012-03-06 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
[Qt] Don't add recursive qmake_all target if there are no subdirs to recurse
Reviewed by Ossy.
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro (109899 => 109900)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-03-06 12:11:05 UTC (rev 109899)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2012-03-06 12:15:41 UTC (rev 109900)
@@ -23,7 +23,7 @@
macx: QT += xml
haveQt(5): QT += widgets printsupport
-contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
HEADERS += \
$$PWD/../WorkQueue.h \
Modified: trunk/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp (109899 => 109900)
--- trunk/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp 2012-03-06 12:11:05 UTC (rev 109899)
+++ trunk/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp 2012-03-06 12:15:41 UTC (rev 109900)
@@ -26,9 +26,11 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "config.h"
+
#include "QtInitializeTestFonts.h"
-#if defined(HAVE_FONTCONFIG) && HAVE_FONTCONFIG
+#if HAVE(FONTCONFIG)
#include <QByteArray>
#include <QDir>
#include <fontconfig/fontconfig.h>
@@ -38,7 +40,7 @@
void initializeTestFonts()
{
-#if defined(HAVE_FONTCONFIG) && HAVE_FONTCONFIG
+#if HAVE(FONTCONFIG)
static int numFonts = -1;
FcInit();
Modified: trunk/Tools/QtTestBrowser/QtTestBrowser.pro (109899 => 109900)
--- trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2012-03-06 12:11:05 UTC (rev 109899)
+++ trunk/Tools/QtTestBrowser/QtTestBrowser.pro 2012-03-06 12:15:41 UTC (rev 109900)
@@ -39,7 +39,7 @@
cookiejar.h
-WEBKIT += webcore
+WEBKIT += wtf webcore
CONFIG += qtwebkit
@@ -50,7 +50,7 @@
macx:QT += xml
haveQt(5): QT += printsupport widgets
-contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
contains(QT_CONFIG, opengl) {
QT += opengl
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (109899 => 109900)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-03-06 12:11:05 UTC (rev 109899)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-03-06 12:15:41 UTC (rev 109900)
@@ -58,7 +58,7 @@
CONFIG += plugin qtwebkit rpath
-contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
INCLUDEPATH += \
$$PWD/.. \
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (109899 => 109900)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-03-06 12:11:05 UTC (rev 109899)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-03-06 12:15:41 UTC (rev 109900)
@@ -46,12 +46,16 @@
}
# We need fontconfig to set up the test fonts for DumpRenderTree and WebKitTestRunner.
-haveQt(5):contains(config_test_fontconfig, yes):!mac {
- DEFINES += HAVE_FONTCONFIG=1
+haveQt(5) {
+ contains(config_test_fontconfig, yes):!mac {
+ DEFINES += WTF_HAVE_FONTCONFIG=1
+ }
+} else {
+ # Qt 4
+ unix:!mac:!embedded {
+ DEFINES += WTF_HAVE_FONTCONFIG=1
+ }
}
-haveQt(4):unix:!mac:!embedded {
- DEFINES += HAVE_FONTCONFIG=1
-}
# Feature defines: for web-facing features only
!contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=.): DEFINES += ENABLE_JAVASCRIPT_DEBUGGER=1
@@ -136,7 +140,7 @@
}
# QStyle detection
-haveQt(4)|!isEmpty(QT.widgets.name): DEFINES += HAVE_QSTYLE=1
+haveQt(4)|!isEmpty(QT.widgets.name): DEFINES += WTF_HAVE_QSTYLE=1
# WebGL support
contains(QT_CONFIG, opengl):!win32-* {
