Commit 03a27fc2 authored by vestbo@webkit.org's avatar vestbo@webkit.org

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

Reviewed by Simon Hausmann.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@109887 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 2b89b81e
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
......@@ -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 \
......
......@@ -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();
......
......@@ -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
......
......@@ -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/.. \
......
......@@ -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-* {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment