1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
|
From b3a2f426eed83f4a14e12f4040038f4e432f2c0b 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 +
qt3support/src/plugins/accessible/accessible.pro | 22 ++++++++++++++++++++++
qt3support/src/plugins/accessible/compat.pro | 20 --------------------
qt3support/src/qt3support/text/text.pri | 4 +++-
qt3support/src/tools/uic3/uic3.pro | 6 ++++--
5 files changed, 30 insertions(+), 23 deletions(-)
create mode 100644 qt3support/src/plugins/accessible/accessible.pro
delete mode 100644 qt3support/src/plugins/accessible/compat.pro
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/accessible.pro b/qt3support/src/plugins/accessible/accessible.pro
new file mode 100644
index 0000000..b69595b
--- /dev/null
+++ b/qt3support/src/plugins/accessible/accessible.pro
@@ -0,0 +1,22 @@
+load(qt_module)
+
+TARGET = qtaccessiblecompatwidgets
+CONFIG += qt_no_compat_warning
+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
+
+QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)"
+
+QT += qt3support
+
+SOURCES += main.cpp \
+ q3simplewidgets.cpp \
+ q3complexwidgets.cpp \
+ qaccessiblecompat.cpp
+
+HEADERS += qaccessiblecompat.h \
+ q3complexwidgets.h \
+ q3simplewidgets.h
+
diff --git a/qt3support/src/plugins/accessible/compat.pro b/qt3support/src/plugins/accessible/compat.pro
deleted file mode 100644
index 0ad5a9a..0000000
--- a/qt3support/src/plugins/accessible/compat.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-TARGET = qtaccessiblecompatwidgets
-CONFIG += qt_no_compat_warning
-include(../../qpluginbase.pri)
-include (../qaccessiblebase.pri)
-
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/accessible
-
-QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)"
-
-QT += qt3support
-
-SOURCES += main.cpp \
- q3simplewidgets.cpp \
- q3complexwidgets.cpp \
- qaccessiblecompat.cpp
-
-HEADERS += qaccessiblecompat.h \
- q3complexwidgets.h \
- q3simplewidgets.h
-
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.4
|
