blob: 367e25f87f4739f9e44b1d31985d4d6effc31a5a (
plain)
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
|
From 4b8cf02b0d60131bfff07cb1c8b73dc0b7cdef37 Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Thu, 21 Apr 2011 07:47:12 -0500
Subject: [PATCH] Use private headers
---
modules/qt_qt3support.pri | 10 +++++-----
src/plugins/accessible/accessible.pro | 2 +-
src/qt3support/qt3support.pro | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/modules/qt_qt3support.pri b/modules/qt_qt3support.pri
index 12fc41e..e565ff9 100644
--- a/modules/qt_qt3support.pri
+++ b/modules/qt_qt3support.pri
@@ -1,12 +1,12 @@
-QT_QT3SUPPORT_VERSION = $$QT_VERSION
-QT_QT3SUPPORT_MAJOR_VERSION = $$QT_MAJOR_VERSION
-QT_QT3SUPPORT_MINOR_VERSION = $$QT_MINOR_VERSION
-QT_QT3SUPPORT_PATCH_VERSION = $$QT_PATCH_VERSION
+QT.qt3support.VERSION = 4.8.0
+QT.qt3support.MAJOR_VERSION = 4
+QT.qt3support.MINOR_VERSION = 8
+QT.qt3support.PATCH_VERSION = 0
QT.qt3support.name = Qt3Support
QT.qt3support.bins = $$QT_MODULE_BIN_BASE
QT.qt3support.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt3Support
-QT.qt3support.private_includes = $$QT_MODULE_INCLUDE_BASE/Qt3Support/private
+QT.qt3support.private_includes = $$QT_MODULE_INCLUDE_BASE/Qt3Support/$$QT.qt3support.VERSION
QT.qt3support.sources = $$QT_MODULE_BASE/src/qt3support
QT.qt3support.libs = $$QT_MODULE_LIB_BASE
QT.qt.plugins = $$QT_MODULE_PLUGIN_BASE
diff --git a/src/plugins/accessible/accessible.pro b/src/plugins/accessible/accessible.pro
index 3c458ce..4bcd4ad 100644
--- a/src/plugins/accessible/accessible.pro
+++ b/src/plugins/accessible/accessible.pro
@@ -9,7 +9,7 @@ DESTDIR = $$QT.qt3support.plugins/accessible
QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)"
-QT += qt3support
+QT += qt3support-private
SOURCES += main.cpp \
q3simplewidgets.cpp \
diff --git a/src/qt3support/qt3support.pro b/src/qt3support/qt3support.pro
index b1ecca6..b2f0c33 100644
--- a/src/qt3support/qt3support.pro
+++ b/src/qt3support/qt3support.pro
@@ -2,7 +2,7 @@ load(qt_module)
TARGET = Qt3Support
QPRO_PWD = $$PWD
-QT = core gui network sql
+QT = core-private gui-private network sql
DEFINES += QT_BUILD_COMPAT_LIB
DEFINES += QT_NO_USING_NAMESPACE
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x60000000
--
1.7.5.rc2.4.g4d8b3
|
