From 4598eaba89c7d38e26e3283835b74f426be30269 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Mon, 6 Aug 2012 15:53:15 +0200
Subject: [PATCH] Small cleanup in the pro file

Qt Console edition doesn't exist anymore, so remove the
reference to it.
Adding x11 to the config also doesn't make any sense
anymore.

Change-Id: I8020a648575ef4482ffbe7d4f2c47dd5cc5eb143
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 src/src.pro | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/src.pro b/src/src.pro
index 3fd6423..96249d9 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,4 +1,5 @@
-TEMPLATE        = subdirs
+TEMPLATE = subdirs
+CONFIG += ordered
 
 !contains(QT_CONFIG, no-gui) {
     no-png {
@@ -6,12 +7,8 @@ TEMPLATE        = subdirs
     } else {
         SUBDIRS = assistant \
                   pixeltool \
-                  qtestlib
-        contains(QT_EDITION, Console) {
-            SUBDIRS += designer/src/uitools     # Linguist depends on this
-        } else {
-            SUBDIRS += designer
-        }
+                  qtestlib \
+                  designer
 #    unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
     }
 }
@@ -28,6 +25,3 @@ contains(QT_CONFIG, dbus):SUBDIRS += qdbus
 # We don't need these command line utilities on embedded platforms.
 embedded: SUBDIRS += makeqpf
 
-CONFIG+=ordered
-
-!win32:!embedded:!mac:CONFIG += x11
-- 
2.7.4