Fixes for the second final push (the first one failed).HEADmaster

1 files changed, 112 insertions, 25 deletions

diff --git a/patches/0002-qmake-profiles-for-qttools.patch b/patches/0002-qmake-profiles-for-qttools.patch
index 858201d..8a2ee99 100644
--- a/patches/0002-qmake-profiles-for-qttools.patch
+++ b/patches/0002-qmake-profiles-for-qttools.patch
@@ -1,13 +1,15 @@
-From be1856e436e4c1bd5fc968c073d597d7da3cc1d4 Mon Sep 17 00:00:00 2001
+From 9bd10e1d182166168daaa56aef1d33f8ec07a07c Mon Sep 17 00:00:00 2001
 From: Olivier Goffart <[email protected]>
 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/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
@@ -22,29 +24,114 @@ index 134678f..aac2ec6 100644
  
  INCLUDEPATH += . .. \
                 $$CLUCENEDIR \
-diff --git a/qttools/src/tools.pro b/qttools/src/src.pro
-similarity index 89%
-rename from qttools/src/tools.pro
-rename to qttools/src/src.pro
-index f090b86..c6174e4 100644
---- a/qttools/src/tools.pro
+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
-@@ -23,7 +23,6 @@ TEMPLATE        = subdirs
-         unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig
-         win32:!wince*:SUBDIRS += activeqt
-     }
+@@ -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
-@@ -36,7 +35,6 @@ embedded:SUBDIRS += kmap2qmap
- 
- contains(QT_CONFIG, dbus):SUBDIRS += qdbus
- # We don't need these command line utilities on embedded platforms.
+-}
+-
+-!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
+-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.2.343.g7d43d
+1.7.3.4