From 5ea41a2efa67c2ca1fe13a00992a8b7cb29a00cf Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Dec 2012 21:15:02 +0100 Subject: properly syncqt-ize harfbuzz headers we were already installing them into QtCore/private, so turn them into proper private headers to start with. this cleans up our project files. Change-Id: I0795f79e03b60b5854de9e4dc339e9b5a5e6fd87 Reviewed-by: Lars Knoll Reviewed-by: Joerg Bornemann --- tests/auto/gui/text/qrawfont/qrawfont.pro | 2 -- tests/auto/gui/text/qtextlayout/qtextlayout.pro | 1 - tests/auto/gui/text/qtextscriptengine/generate/generate.pro | 2 +- tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) (limited to 'tests/auto/gui/text') diff --git a/tests/auto/gui/text/qrawfont/qrawfont.pro b/tests/auto/gui/text/qrawfont/qrawfont.pro index b764cfbee0..ce4d0aec40 100644 --- a/tests/auto/gui/text/qrawfont/qrawfont.pro +++ b/tests/auto/gui/text/qrawfont/qrawfont.pro @@ -7,7 +7,5 @@ QT = core core-private gui gui-private testlib SOURCES += \ tst_qrawfont.cpp -INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src - TESTDATA += testfont_bold_italic.ttf testfont.ttf DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtextlayout/qtextlayout.pro b/tests/auto/gui/text/qtextlayout/qtextlayout.pro index 696fae0a9c..9833a5bd1a 100644 --- a/tests/auto/gui/text/qtextlayout/qtextlayout.pro +++ b/tests/auto/gui/text/qtextlayout/qtextlayout.pro @@ -4,5 +4,4 @@ QT += core-private gui-private testlib HEADERS += SOURCES += tst_qtextlayout.cpp DEFINES += QT_COMPILES_IN_HARFBUZZ -INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtextscriptengine/generate/generate.pro b/tests/auto/gui/text/qtextscriptengine/generate/generate.pro index 94500e4195..bd85c108c2 100644 --- a/tests/auto/gui/text/qtextscriptengine/generate/generate.pro +++ b/tests/auto/gui/text/qtextscriptengine/generate/generate.pro @@ -1,6 +1,6 @@ CONFIG -= moc +QT += core-private # for harfbuzz INCLUDEPATH += . /usr/include/freetype2 -INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src SOURCES += main.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro b/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro index 37eab00c8d..e355a90e5c 100644 --- a/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro +++ b/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro @@ -6,5 +6,4 @@ QT += core-private gui-private testlib HEADERS += SOURCES += tst_qtextscriptengine.cpp -INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- cgit v1.2.3