diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-03-28 11:27:19 -0500 |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-03-28 11:30:40 -0500 |
| commit | c7d9bf1746a68f509a7958730364c89d807e35ab (patch) | |
| tree | f647abd75b6d38031d9ed5f6e6a3b68a2959ea75 /patches/0025-Make-tools-compile.patch | |
| parent | 0fa1720361d347bf8dda7bc337b22621d7064a85 (diff) | |
Rebase ontop of current master
Diffstat (limited to 'patches/0025-Make-tools-compile.patch')
| -rw-r--r-- | patches/0025-Make-tools-compile.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/0025-Make-tools-compile.patch b/patches/0025-Make-tools-compile.patch index aa8c16e..04570bb 100644 --- a/patches/0025-Make-tools-compile.patch +++ b/patches/0025-Make-tools-compile.patch @@ -1,4 +1,4 @@ -From 401dc79ff99a6648eb1a0f3bb6421883c085f12d Mon Sep 17 00:00:00 2001 +From db5af2953aa0bb504c9a4387a350bdf9bdcc1758 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. @@ -274,14 +274,14 @@ index 3ed909a..5f1996e 100644 SOURCES += \ main.cpp \ diff --git a/qttools/src/qtconfig/qtconfig.pro b/qttools/src/qtconfig/qtconfig.pro -index d1fd320..06d8ca5 100644 +index cb06e5a..bd758d9 100644 --- a/qttools/src/qtconfig/qtconfig.pro +++ b/qttools/src/qtconfig/qtconfig.pro @@ -1,3 +1,5 @@ +load(qt_module) + TEMPLATE = app - CONFIG += qt warn_on x11 + CONFIG += qt warn_on x11 build_all:!build_pass { diff --git a/qttools/src/qttracereplay/qttracereplay.pro b/qttools/src/qttracereplay/qttracereplay.pro index cc5b98d..691a66b 100644 @@ -301,7 +301,7 @@ index cc5b98d..691a66b 100644 # Input diff --git a/qttools/src/src.pro b/qttools/src/src.pro -index 7b0b114..6491236 100644 +index c6174e4..14948c9 100644 --- a/qttools/src/src.pro +++ b/qttools/src/src.pro @@ -11,7 +11,6 @@ TEMPLATE = subdirs @@ -316,8 +316,8 @@ index 7b0b114..6491236 100644 SUBDIRS += designer } } -- unix:!mac:!embedded:!qpa:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig -+# unix:!mac:!embedded:!qpa:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig +- unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig ++# unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig win32:!wince*:SUBDIRS += activeqt } } |