summaryrefslogtreecommitdiffstats
path: root/patches/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@nokia.com>2011-03-29 09:44:16 +0200
committerLiang Qi <liang.qi@nokia.com>2011-03-29 09:47:08 +0200
commitc3698ea3e965cea74c039b8f8e4c968829f01dc0 (patch)
tree6f3b72926f9dc785b9504175a8b6625b9c67f1c5 /patches/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch
parent16d34d2c99ac8209ba0b085ad52b69bd1eb191d2 (diff)
Replace qtkernel with qtbase
Diffstat (limited to 'patches/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch')
-rw-r--r--patches/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/patches/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch b/patches/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch
index 57783fd..aa8bb3b 100644
--- a/patches/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch
+++ b/patches/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch
@@ -4,14 +4,14 @@ Date: Mon, 3 Jan 2011 22:54:07 +0100
Subject: [PATCH] Made the internal support for Qt3Support in QtGui compile.
---
- qtkernel/src/qbase.pri | 2 +-
- qtkernel/src/tools/uic/uic.pro | 2 +-
+ qtbase/src/qbase.pri | 2 +-
+ qtbase/src/tools/uic/uic.pro | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/qtkernel/src/qbase.pri b/qtkernel/src/qbase.pri
+diff --git a/qtbase/src/qbase.pri b/qtbase/src/qbase.pri
index f8ababb..a875a56 100644
---- a/qtkernel/src/qbase.pri
-+++ b/qtkernel/src/qbase.pri
+--- a/qtbase/src/qbase.pri
++++ b/qtbase/src/qbase.pri
@@ -166,7 +166,7 @@ win32-g++* {
contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
@@ -21,10 +21,10 @@ index f8ababb..a875a56 100644
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/qtkernel/src/tools/uic/uic.pro b/qtkernel/src/tools/uic/uic.pro
+diff --git a/qtbase/src/tools/uic/uic.pro b/qtbase/src/tools/uic/uic.pro
index 9b63d42..591925c 100644
---- a/qtkernel/src/tools/uic/uic.pro
-+++ b/qtkernel/src/tools/uic/uic.pro
+--- a/qtbase/src/tools/uic/uic.pro
++++ b/qtbase/src/tools/uic/uic.pro
@@ -6,7 +6,7 @@ DEFINES += QT_UIC
INCLUDEPATH += .
DEPENDPATH += .