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
123
124
125
126
127
128
129
130
131
132
|
From 4cf331c5a6d3be17cd3a8410960341f8bf0c4841 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Thu, 25 Nov 2010 13:39:10 +0100
Subject: [PATCH] Remove the hardcode QT_CONFIG in those pri files.
---
qtbase/src/modules/qt_core.pri | 2 --
qtbase/src/modules/qt_dbus.pri | 2 --
qtbase/src/modules/qt_gui.pri | 2 --
qtbase/src/modules/qt_network.pri | 2 --
qtbase/src/modules/qt_opengl.pri | 2 --
qtbase/src/modules/qt_openvg.pri | 2 --
qtbase/src/modules/qt_sql.pri | 2 --
qtbase/src/modules/qt_svg.pri | 2 --
qtbase/src/modules/qt_testlib.pri | 2 --
qtbase/src/modules/qt_xml.pri | 2 --
qtxmlpatterns/modules/qt_xmlpatterns.pri | 2 --
11 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/qtbase/src/modules/qt_core.pri b/qtbase/src/modules/qt_core.pri
index 742aefe..e90011a 100644
--- a/qtbase/src/modules/qt_core.pri
+++ b/qtbase/src/modules/qt_core.pri
@@ -7,5 +7,3 @@ QT.core.name = QtCore
QT.core.includes = $$QT_MODULE_INCLUDE_BASE/QtCore
QT.core.libs = $$QT_MODULE_LIB_BASE
QT.core.depends =
-
-QT_CONFIG += core
diff --git a/qtbase/src/modules/qt_dbus.pri b/qtbase/src/modules/qt_dbus.pri
index fddcbf7..b762353 100644
--- a/qtbase/src/modules/qt_dbus.pri
+++ b/qtbase/src/modules/qt_dbus.pri
@@ -8,5 +8,3 @@ QT.dbus.includes = $$QT_MODULE_INCLUDE_BASE/QtDBus
QT.dbus.libs = $$QT_MODULE_LIB_BASE
QT.dbus.depends = core xml
QT.dbus.CONFIG = dbusadaptors dbusinterfaces
-
-QT_CONFIG += dbus
diff --git a/qtbase/src/modules/qt_gui.pri b/qtbase/src/modules/qt_gui.pri
index 6da7431..f6b9720 100644
--- a/qtbase/src/modules/qt_gui.pri
+++ b/qtbase/src/modules/qt_gui.pri
@@ -7,5 +7,3 @@ QT.gui.name = QtGui
QT.gui.includes = $$QT_MODULE_INCLUDE_BASE/QtGui
QT.gui.libs = $$QT_MODULE_LIB_BASE
QT.gui.depends = core network
-
-QT_CONFIG += gui
diff --git a/qtbase/src/modules/qt_network.pri b/qtbase/src/modules/qt_network.pri
index 4d32079..d794b2e 100644
--- a/qtbase/src/modules/qt_network.pri
+++ b/qtbase/src/modules/qt_network.pri
@@ -7,5 +7,3 @@ QT.network.name = QtNetwork
QT.network.includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork
QT.network.libs = $$QT_MODULE_LIB_BASE
QT.network.depends = core
-
-QT_CONFIG += network
diff --git a/qtbase/src/modules/qt_opengl.pri b/qtbase/src/modules/qt_opengl.pri
index 9ad1425..9eff7ef 100644
--- a/qtbase/src/modules/qt_opengl.pri
+++ b/qtbase/src/modules/qt_opengl.pri
@@ -8,5 +8,3 @@ QT.opengl.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL
QT.opengl.libs = $$QT_MODULE_LIB_BASE
QT.opengl.depends = core gui
QT.opengl.CONFIG = opengl
-
-QT_CONFIG += opengl
diff --git a/qtbase/src/modules/qt_openvg.pri b/qtbase/src/modules/qt_openvg.pri
index 612bd13..e9fa17f 100644
--- a/qtbase/src/modules/qt_openvg.pri
+++ b/qtbase/src/modules/qt_openvg.pri
@@ -8,5 +8,3 @@ QT.openvg.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG
QT.openvg.libs = $$QT_MODULE_LIB_BASE
QT.openvg.depends = core gui
QT.openvg.CONFIG = openvg
-
-QT_CONFIG += openvg
diff --git a/qtbase/src/modules/qt_sql.pri b/qtbase/src/modules/qt_sql.pri
index bf5917b..93cac45 100644
--- a/qtbase/src/modules/qt_sql.pri
+++ b/qtbase/src/modules/qt_sql.pri
@@ -7,5 +7,3 @@ QT.sql.name = QtSql
QT.sql.includes = $$QT_MODULE_INCLUDE_BASE/QtSql
QT.sql.libs = $$QT_MODULE_LIB_BASE
QT.sql.depends = core
-
-QT_CONFIG += sql
diff --git a/qtbase/src/modules/qt_svg.pri b/qtbase/src/modules/qt_svg.pri
index faccb78..27b4fb0 100644
--- a/qtbase/src/modules/qt_svg.pri
+++ b/qtbase/src/modules/qt_svg.pri
@@ -7,5 +7,3 @@ QT.svg.name = QtSvg
QT.svg.includes = $$QT_MODULE_INCLUDE_BASE/QtSvg
QT.svg.libs = $$QT_MODULE_LIB_BASE
QT.svg.depends = core gui
-
-QT_CONFIG += svg
diff --git a/qtbase/src/modules/qt_testlib.pri b/qtbase/src/modules/qt_testlib.pri
index 0f65438..05db9db 100644
--- a/qtbase/src/modules/qt_testlib.pri
+++ b/qtbase/src/modules/qt_testlib.pri
@@ -8,5 +8,3 @@ QT.testlib.includes = $$QT_MODULE_INCLUDE_BASE/QtTest
QT.testlib.libs = $$QT_MODULE_LIB_BASE
QT.testlib.depends = core
QT.testlib.CONFIG = console
-
-QT_CONFIG += testlib
diff --git a/qtbase/src/modules/qt_xml.pri b/qtbase/src/modules/qt_xml.pri
index 45dbc667..06fc5fc 100644
--- a/qtbase/src/modules/qt_xml.pri
+++ b/qtbase/src/modules/qt_xml.pri
@@ -7,5 +7,3 @@ QT.xml.name = QtXml
QT.xml.includes = $$QT_MODULE_INCLUDE_BASE/QtXml
QT.xml.libs = $$QT_MODULE_LIB_BASE
QT.xml.depends = core
-
-QT_CONFIG += xml
diff --git a/qtxmlpatterns/modules/qt_xmlpatterns.pri b/qtxmlpatterns/modules/qt_xmlpatterns.pri
index 2237142..ac83022 100644
--- a/qtxmlpatterns/modules/qt_xmlpatterns.pri
+++ b/qtxmlpatterns/modules/qt_xmlpatterns.pri
@@ -7,5 +7,3 @@ QT.xmlpatterns.name = QtXmlPatterns
QT.xmlpatterns.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtXmlPatterns
QT.xmlpatterns.libs = $$QT_MODULE_LIB_BASE
QT.xmlpatterns.depends = core network
-
-QT_CONFIG += xmlpatterns
--
1.7.3.2.343.g7d43d
|
