summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2010-12-14 13:17:08 +0100
committeraxis <qt-info@nokia.com>2011-04-27 12:05:48 +0200
commit691c02186bea6ce31eb8a81f7b07e902d22e55dc (patch)
tree7bd138b8a8a0139f108cd4d07647626350e6a540
parent36e174563e385a539b4b3887f339ce39e89af712 (diff)
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
-rw-r--r--modules/qt_qt3support.pri1
-rw-r--r--src/plugins/accessible/accessible.pro (renamed from src/plugins/accessible/compat.pro)6
-rw-r--r--src/qt3support/text/text.pri4
-rw-r--r--src/tools/uic3/uic3.pro6
4 files changed, 12 insertions, 5 deletions
diff --git a/modules/qt_qt3support.pri b/modules/qt_qt3support.pri
index 4b8c04c..400b69c 100644
--- a/modules/qt_qt3support.pri
+++ b/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/src/plugins/accessible/compat.pro b/src/plugins/accessible/accessible.pro
index 0ad5a9a..b69595b 100644
--- a/src/plugins/accessible/compat.pro
+++ b/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/src/qt3support/text/text.pri b/src/qt3support/text/text.pri
index 0e74761..ddabc2a 100644
--- a/src/qt3support/text/text.pri
+++ b/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/src/tools/uic3/uic3.pro b/src/tools/uic3/uic3.pro
index 5ad3c4d..a42e652 100644
--- a/src/tools/uic3/uic3.pro
+++ b/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 += .