[Qt] Use correct define names for HAVE(FOO) style optional dependencies

Reviewed by Simon Hausmann. Canonical link: https://commits.webkit.org/97525@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@109887 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Mar 6, 2012 · 7f2b524 · 7f2b524
1 parent 41c7326
commit 7f2b524
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 11 deletions.
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2012-03-06  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        [Qt] Use correct define names for HAVE(FOO) style optional dependencies
+
+        Reviewed by Simon Hausmann.
+
+        * 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  Kristóf Kosztyó  <kkristof@inf.u-szeged.hu>
 
         [Qt] Create EWS to build WebKit2

diff --git a/Tools/DumpRenderTree/qt/DumpRenderTree.pro b/Tools/DumpRenderTree/qt/DumpRenderTree.pro
@@ -23,7 +23,7 @@ QT = core gui network testlib
 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 \

diff --git a/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp b/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp
@@ -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 @@ namespace WebKit {
 
 void initializeTestFonts()
 {
-#if defined(HAVE_FONTCONFIG) && HAVE_FONTCONFIG
+#if HAVE(FONTCONFIG)
     static int numFonts = -1;
 
     FcInit();

diff --git a/Tools/QtTestBrowser/QtTestBrowser.pro b/Tools/QtTestBrowser/QtTestBrowser.pro
@@ -50,7 +50,7 @@ QT += network
 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

diff --git a/Tools/WebKitTestRunner/InjectedBundle/Target.pri b/Tools/WebKitTestRunner/InjectedBundle/Target.pri
@@ -58,7 +58,7 @@ WEBKIT += wtf javascriptcore webcore
 
 CONFIG += plugin qtwebkit rpath
 
-contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
 
 INCLUDEPATH += \
     $$PWD/.. \

diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf
@@ -46,11 +46,15 @@ isEmpty(HAVE_QRAWFONT) {
 }
 
 # 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(4):unix:!mac:!embedded {
-    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
+    }
 }
 
 # Feature defines: for web-facing features only
@@ -136,7 +140,7 @@ haveQt(4):unix:!mac:!embedded {
 }
 
 # 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-* {