Compile fix, and remove warnings

2011-06-10 13:26:36 +02:00 · 2011-06-10 13:26:36 +02:00 · 85a992a3f8
commit 85a992a3f8
parent c70efdec0f
4 changed files with 6 additions and 4 deletions
--- a/src/platformsupport/fontdatabases/basicunix/basicunix.pri
+++ b/src/platformsupport/fontdatabases/basicunix/basicunix.pri
@ -9,10 +9,6 @@ SOURCES += \
        $$PWD/qbasicunixfontdatabase.cpp \
        $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp

-INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
-
-INCLUDEPATH += $$PWD
-
 CONFIG += opentype

 contains(QT_CONFIG, freetype) {
--- a/src/platformsupport/fontdatabases/fontdatabases.pri
+++ b/src/platformsupport/fontdatabases/fontdatabases.pri
@ -1,3 +1,6 @@
+DEFINES += QT_COMPILES_IN_HARFBUZZ
+INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
+
 unix {
    include($$PWD/basicunix/basicunix.pri)
    include($$PWD/genericunix/genericunix.pri)
--- a/src/platformsupport/platformsupport.pro
+++ b/src/platformsupport/platformsupport.pro
@ -1,3 +1,4 @@
+load(qt_module)
 TARGET	   = QtPlatformSupport
 QPRO_PWD   = $$PWD
 QT         += core-private gui-private
--- a/src/widgets/widgets.pro
+++ b/src/widgets/widgets.pro
@ -1,3 +1,5 @@
+load(qt_module)
+
 TARGET     = QtWidgets
 QPRO_PWD   = $$PWD
 QT = core core-private gui gui-private