summaryrefslogtreecommitdiffstats
path: root/patches/0025-Make-tools-compile.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/0025-Make-tools-compile.patch')
-rw-r--r--patches/0025-Make-tools-compile.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/0025-Make-tools-compile.patch b/patches/0025-Make-tools-compile.patch
index 04570bb..b111474 100644
--- a/patches/0025-Make-tools-compile.patch
+++ b/patches/0025-Make-tools-compile.patch
@@ -1,4 +1,4 @@
-From db5af2953aa0bb504c9a4387a350bdf9bdcc1758 Mon Sep 17 00:00:00 2001
+From 74b7fb67b70903eb483288c44314fbc8aaeb6aa0 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Tue, 11 Jan 2011 08:40:22 +0100
Subject: [PATCH] Make tools compile.
@@ -193,12 +193,12 @@ index 3ba6f52..4e0e2b2 100644
QMAKE_TARGET_DESCRIPTION = Graphical user interface designer.
diff --git a/qttools/src/designer/src/lib/shared/shared.pri b/qttools/src/designer/src/lib/shared/shared.pri
-index 8286360..589a357 100644
+index 9d50911..0d14517 100644
--- a/qttools/src/designer/src/lib/shared/shared.pri
+++ b/qttools/src/designer/src/lib/shared/shared.pri
@@ -4,7 +4,7 @@ contains(QT_CONFIG, script): QT += script
- include(../../../../shared/qtpropertybrowser/qtpropertybrowser.pri)
+ include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri)
include(../../../../shared/deviceskin/deviceskin.pri)
-include(../../../../../src/tools/rcc/rcc.pri)
+include($$QT_SOURCE_TREE/src/tools/rcc/rcc.pri)
@@ -301,7 +301,7 @@ index cc5b98d..691a66b 100644
# Input
diff --git a/qttools/src/src.pro b/qttools/src/src.pro
-index c6174e4..14948c9 100644
+index c6174e4..02e6a23 100644
--- a/qttools/src/src.pro
+++ b/qttools/src/src.pro
@@ -11,7 +11,6 @@ TEMPLATE = subdirs