From 8761f6e3ad9de619edeedc8bbc6db9bb3d02b104 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Tue, 14 Dec 2010 13:17:08 +0100
Subject: [PATCH] More to the compilation of Qt3Support in a modularized Qt.

It still depends on having the Qt sources available.

For example for qpluginbase.pri, for harfbuzz headers, and
for some of the uic sources
---
 qt3support/modules/qt_qt3support.pri               |    1 +
 .../accessible/{compat.pro => accessible.pro}      |    6 ++++--
 qt3support/src/qt3support/text/text.pri            |    4 +++-
 qt3support/src/tools/uic3/uic3.pro                 |    6 ++++--
 4 files changed, 12 insertions(+), 5 deletions(-)
 rename qt3support/src/plugins/accessible/{compat.pro => accessible.pro} (75%)

diff --git a/qt3support/modules/qt_qt3support.pri b/qt3support/modules/qt_qt3support.pri
index 4b8c04c..400b69c 100644
--- a/qt3support/modules/qt_qt3support.pri
+++ b/qt3support/modules/qt_qt3support.pri
@@ -7,3 +7,4 @@ QT.qt3support.name = Qt3Support
 QT.qt3support.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt3Support
 QT.qt3support.libs = $$QT_MODULE_LIB_BASE
 QT.qt3support.depends = core gui
+QT.qt3support.DEFINES = QT3_SUPPORT
diff --git a/qt3support/src/plugins/accessible/compat.pro b/qt3support/src/plugins/accessible/accessible.pro
similarity index 75%
rename from qt3support/src/plugins/accessible/compat.pro
rename to qt3support/src/plugins/accessible/accessible.pro
index 0ad5a9a..b69595b 100644
--- a/qt3support/src/plugins/accessible/compat.pro
+++ b/qt3support/src/plugins/accessible/accessible.pro
@@ -1,7 +1,9 @@
+load(qt_module)
+
 TARGET  = qtaccessiblecompatwidgets
 CONFIG += qt_no_compat_warning
-include(../../qpluginbase.pri)
-include (../qaccessiblebase.pri)
+include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri)
+include($$QT_SOURCE_TREE/src/plugins/accessible/qaccessiblebase.pri)
 
 QTDIR_build:DESTDIR  = $$QT_BUILD_TREE/plugins/accessible
 
diff --git a/qt3support/src/qt3support/text/text.pri b/qt3support/src/qt3support/text/text.pri
index 0e74761..ddabc2a 100644
--- a/qt3support/src/qt3support/text/text.pri
+++ b/qt3support/src/qt3support/text/text.pri
@@ -1,3 +1,5 @@
+load(qt_module)
+
 HEADERS += \
 	text/q3syntaxhighlighter.h \
 	text/q3syntaxhighlighter_p.h \
@@ -22,4 +24,4 @@ SOURCES += \
 	text/q3stylesheet.cpp \
 	text/q3textstream.cpp
 
-INCLUDEPATH += ../3rdparty/harfbuzz/src
+INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
diff --git a/qt3support/src/tools/uic3/uic3.pro b/qt3support/src/tools/uic3/uic3.pro
index 5ad3c4d..a42e652 100644
--- a/qt3support/src/tools/uic3/uic3.pro
+++ b/qt3support/src/tools/uic3/uic3.pro
@@ -1,3 +1,5 @@
+load(qt_module)
+
 TEMPLATE = app
 CONFIG += console qt_no_compat_warning
 CONFIG -= app_bundle
@@ -10,8 +12,8 @@ QT += xml qt3support
 
 DESTDIR = ../../../bin
 
-include(../uic/uic.pri)
-include(../uic/cpp/cpp.pri)
+include($$QT_SOURCE_TREE/src/tools/uic/uic.pri)
+include($$QT_SOURCE_TREE/src/tools/uic/cpp/cpp.pri)
 
 INCLUDEPATH += .
 
-- 
1.7.3.2.343.g7d43d