From 9bd10e1d182166168daaa56aef1d33f8ec07a07c 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/src.pro                                |   47 +++++++++++++++++++
 qttools/src/tools.pro                              |   49 --------------------
 3 files changed, 48 insertions(+), 50 deletions(-)
 create mode 100644 qttools/src/src.pro
 delete mode 100644 qttools/src/tools.pro

diff --git a/qttools/src/assistant/lib/fulltextsearch/fulltextsearch.pri b/qttools/src/assistant/lib/fulltextsearch/fulltextsearch.pri
index 134678f..aac2ec6 100644
--- a/qttools/src/assistant/lib/fulltextsearch/fulltextsearch.pri
+++ b/qttools/src/assistant/lib/fulltextsearch/fulltextsearch.pri
@@ -1,7 +1,7 @@
 DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
 win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
 
-CLUCENEDIR = ../../../../src/3rdparty/clucene/src/CLucene
+CLUCENEDIR = ../../../../3rdparty/clucene/src/CLucene
 
 INCLUDEPATH += . .. \
                $$CLUCENEDIR \
diff --git a/qttools/src/src.pro b/qttools/src/src.pro
new file mode 100644
index 0000000..c6174e4
--- /dev/null
+++ b/qttools/src/src.pro
@@ -0,0 +1,47 @@
+TEMPLATE        = subdirs
+
+!contains(QT_CONFIG, no-gui) {
+    no-png {
+        message("Some graphics-related tools are unavailable without PNG support")
+    } else {
+        symbian {
+            SUBDIRS = designer
+        } else:wince* {
+            SUBDIRS = qtestlib designer
+        } else {
+            SUBDIRS = assistant \
+                      pixeltool \
+                      porting \
+                      qtestlib \
+                      qttracereplay
+            contains(QT_EDITION, Console) {
+                SUBDIRS += designer/src/uitools     # Linguist depends on this
+            } else {
+                SUBDIRS += designer
+            }
+        }
+        unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig
+        win32:!wince*:SUBDIRS += activeqt
+    }
+}
+
+!wince*:!symbian:SUBDIRS += linguist
+
+mac {
+    SUBDIRS += macdeployqt
+}
+
+embedded:SUBDIRS += kmap2qmap
+
+contains(QT_CONFIG, dbus):SUBDIRS += qdbus
+# We don't need these command line utilities on embedded platforms.
+embedded: SUBDIRS += makeqpf
+
+!wince*:!cross_compile:SUBDIRS += qdoc3
+
+CONFIG+=ordered
+QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)"
+
+!win32:!embedded:!mac:!symbian:CONFIG += x11
+
+x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper
diff --git a/qttools/src/tools.pro b/qttools/src/tools.pro
deleted file mode 100644
index f090b86..0000000
--- a/qttools/src/tools.pro
+++ /dev/null
@@ -1,49 +0,0 @@
-TEMPLATE        = subdirs
-
-!contains(QT_CONFIG, no-gui) {
-    no-png {
-        message("Some graphics-related tools are unavailable without PNG support")
-    } else {
-        symbian {
-            SUBDIRS = designer
-        } else:wince* {
-            SUBDIRS = qtestlib designer
-        } else {
-            SUBDIRS = assistant \
-                      pixeltool \
-                      porting \
-                      qtestlib \
-                      qttracereplay
-            contains(QT_EDITION, Console) {
-                SUBDIRS += designer/src/uitools     # Linguist depends on this
-            } else {
-                SUBDIRS += designer
-            }
-        }
-        unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig
-        win32:!wince*:SUBDIRS += activeqt
-    }
-    contains(QT_CONFIG, declarative):SUBDIRS += qml
-}
-
-!wince*:!symbian:SUBDIRS += linguist
-
-mac {
-    SUBDIRS += macdeployqt
-}
-
-embedded:SUBDIRS += kmap2qmap
-
-contains(QT_CONFIG, dbus):SUBDIRS += qdbus
-# We don't need these command line utilities on embedded platforms.
-!wince*:!symbian:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator
-embedded: SUBDIRS += makeqpf
-
-!wince*:!cross_compile:SUBDIRS += qdoc3
-
-CONFIG+=ordered
-QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)"
-
-!win32:!embedded:!mac:!symbian:CONFIG += x11
-
-x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper
-- 
1.7.3.4