Unreviewed, rolling out r109887.

http://trac.webkit.org/changeset/109887
https://bugs.webkit.org/show_bug.cgi?id=80402

It broke the build (Requested by Ossy on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-03-06

* DumpRenderTree/qt/DumpRenderTree.pro:
* DumpRenderTree/qt/QtInitializeTestFonts.cpp:
(WebKit::initializeTestFonts):
* QtTestBrowser/QtTestBrowser.pro:
* WebKitTestRunner/InjectedBundle/Target.pri:
* qmake/mkspecs/features/features.prf:

Canonical link: https://commits.webkit.org/97528@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@109890 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog

@@ -1,3 +1,18 @@
+2012-03-06  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r109887.
+        http://trac.webkit.org/changeset/109887
+        https://bugs.webkit.org/show_bug.cgi?id=80402
+
+        It broke the build (Requested by Ossy on #webkit).
+
+        * 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  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r109837.

Tools/DumpRenderTree/qt/DumpRenderTree.pro

@@ -23,7 +23,7 @@ QT = core gui network testlib
 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 \

Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp

@@ -26,11 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
-
 #include "QtInitializeTestFonts.h"
 
-#if HAVE(FONTCONFIG)
+#if defined(HAVE_FONTCONFIG) && HAVE_FONTCONFIG
 #include <QByteArray>
 #include <QDir>
 #include <fontconfig/fontconfig.h>
@@ -40,7 +38,7 @@ namespace WebKit {
 
 void initializeTestFonts()
 {
-#if HAVE(FONTCONFIG)
+#if defined(HAVE_FONTCONFIG) && HAVE_FONTCONFIG
     static int numFonts = -1;
 
     FcInit();

Tools/QtTestBrowser/QtTestBrowser.pro

@@ -50,7 +50,7 @@ QT += network
 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

Tools/WebKitTestRunner/InjectedBundle/Target.pri

@@ -58,7 +58,7 @@ WEBKIT += wtf javascriptcore webcore
 
 CONFIG += plugin qtwebkit rpath
 
-contains(DEFINES, WTF_HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
+contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig
 
 INCLUDEPATH += \
     $$PWD/.. \

Tools/qmake/mkspecs/features/features.prf

@@ -46,15 +46,11 @@ 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 += WTF_HAVE_FONTCONFIG=1
-    }
-} else {
-    # Qt 4
-    unix:!mac:!embedded {
-        DEFINES += WTF_HAVE_FONTCONFIG=1
-    }
+haveQt(5):contains(config_test_fontconfig, yes):!mac {
+    DEFINES += HAVE_FONTCONFIG=1
+}
+haveQt(4):unix:!mac:!embedded {
+    DEFINES += HAVE_FONTCONFIG=1
 }
 
 # Feature defines: for web-facing features only
@@ -140,7 +136,7 @@ haveQt(5) {
 }
 
 # 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-* {