diff options
Diffstat (limited to 'patches/0002-qmake-profiles-for-qttools.patch')
| -rw-r--r-- | patches/0002-qmake-profiles-for-qttools.patch | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/patches/0002-qmake-profiles-for-qttools.patch b/patches/0002-qmake-profiles-for-qttools.patch index 858201d..3112c89 100644 --- a/patches/0002-qmake-profiles-for-qttools.patch +++ b/patches/0002-qmake-profiles-for-qttools.patch @@ -1,13 +1,13 @@ -From be1856e436e4c1bd5fc968c073d597d7da3cc1d4 Mon Sep 17 00:00:00 2001 +From 100450475e4c08d1d64f9b95f9ba05f31194ab67 Mon Sep 17 00:00:00 2001 From: Olivier Goffart <olivier.goffart@nokia.com> Date: Fri, 12 Nov 2010 12:48:25 +0100 Subject: [PATCH] qmake profiles for qttools --- .../lib/fulltextsearch/fulltextsearch.pri | 2 +- - qttools/src/{tools.pro => src.pro} | 2 -- - 2 files changed, 1 insertions(+), 3 deletions(-) - rename qttools/src/{tools.pro => src.pro} (89%) + qttools/src/{tools.pro => src.pro} | 5 ----- + 2 files changed, 1 insertions(+), 6 deletions(-) + rename qttools/src/{tools.pro => src.pro} (85%) diff --git a/qttools/src/assistant/lib/fulltextsearch/fulltextsearch.pri b/qttools/src/assistant/lib/fulltextsearch/fulltextsearch.pri index 134678f..aac2ec6 100644 @@ -23,21 +23,24 @@ index 134678f..aac2ec6 100644 INCLUDEPATH += . .. \ $$CLUCENEDIR \ diff --git a/qttools/src/tools.pro b/qttools/src/src.pro -similarity index 89% +similarity index 85% rename from qttools/src/tools.pro rename to qttools/src/src.pro -index f090b86..c6174e4 100644 +index 1466341..c6174e4 100644 --- a/qttools/src/tools.pro +++ b/qttools/src/src.pro -@@ -23,7 +23,6 @@ TEMPLATE = subdirs +@@ -23,10 +23,6 @@ TEMPLATE = subdirs unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig win32:!wince*:SUBDIRS += activeqt } -- contains(QT_CONFIG, declarative):SUBDIRS += qml +- contains(QT_CONFIG, declarative) { +- SUBDIRS += qml qmlscene +- !symbian: SUBDIRS += qmlplugindump +- } } !wince*:!symbian:SUBDIRS += linguist -@@ -36,7 +35,6 @@ embedded:SUBDIRS += kmap2qmap +@@ -39,7 +35,6 @@ embedded:SUBDIRS += kmap2qmap contains(QT_CONFIG, dbus):SUBDIRS += qdbus # We don't need these command line utilities on embedded platforms. @@ -46,5 +49,5 @@ index f090b86..c6174e4 100644 !wince*:!cross_compile:SUBDIRS += qdoc3 -- -1.7.3.2.343.g7d43d +1.7.5.rc2.4.g4d8b3 |