blob: aa8bb3b2557e495fa5342bf0a5d7c42ae67fc09b (
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
|
From 50bf6b8649acd1c19f28a9d136d0ad5942f32539 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Mon, 3 Jan 2011 22:54:07 +0100
Subject: [PATCH] Made the internal support for Qt3Support in QtGui compile.
---
qtbase/src/qbase.pri | 2 +-
qtbase/src/tools/uic/uic.pro | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/qtbase/src/qbase.pri b/qtbase/src/qbase.pri
index f8ababb..a875a56 100644
--- a/qtbase/src/qbase.pri
+++ b/qtbase/src/qbase.pri
@@ -166,7 +166,7 @@ win32-g++* {
contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS
-contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT
+contains(QT_CONFIG, gui-qt3support):DEFINES *= QT3_SUPPORT
DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code
DEFINES *= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION
diff --git a/qtbase/src/tools/uic/uic.pro b/qtbase/src/tools/uic/uic.pro
index 9b63d42..591925c 100644
--- a/qtbase/src/tools/uic/uic.pro
+++ b/qtbase/src/tools/uic/uic.pro
@@ -6,7 +6,7 @@ DEFINES += QT_UIC
INCLUDEPATH += .
DEPENDPATH += .
-!contains(QT_CONFIG, qt3support):DEFINES += QT_NO_QT3_SUPPORT
+!contains(QT_CONFIG, gui-qt3support):DEFINES += QT_NO_QT3_SUPPORT
include(uic.pri)
include(cpp/cpp.pri)
--
1.7.3.2.343.g7d43d
|
