From 709cc8800e7d8600e181cf6b9f8b1033faefe596 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 24 Feb 2012 14:35:56 +0100
Subject: make makefile generation under unix sane

we now simply call qmake -r, which is also what we do under windows.
-fast mode is retained for examples and tests, though with moderately
modified semantics (i couldn't be bothered to decipher what the old ones
were supposed to be).

Change-Id: Id2c2d2bed9c8d52ac42f31b388bffc34f4649650
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 qtbase.pro | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'qtbase.pro')

diff --git a/qtbase.pro b/qtbase.pro
index e8a26b7e9f..90d63a1bdb 100644
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -25,11 +25,11 @@ contains(PROJECTS, libs) {
 }
 contains(PROJECTS, examples) {
     PROJECTS -= examples
-    SUBDIRS += examples
+    !fast:SUBDIRS += examples
 }
 contains(PROJECTS, tests) {
     PROJECTS -= tests
-    SUBDIRS += module_qtbase_tests
+    !fast:SUBDIRS += module_qtbase_tests
 }
 !isEmpty(PROJECTS) {
     message(Unknown PROJECTS: $$PROJECTS)
-- 
cgit v1.2.3