From 5f0b52ea26e96001f7c6dee98a5bea5956cda718 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 10 Jul 2012 21:35:39 +0200
Subject: put the include/ of all modules into qtbase when doing non-prefix
 build

all other build artifacts go into qtbase's build directory anyway. this
asymmetry was confusing and causes cmake users some grief.

Change-Id: I4d7f7b2318f6c5300eb00360664785cb2c8217b7
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 mkspecs/features/default_pre.prf | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'mkspecs/features/default_pre.prf')

diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf
index 2a729663be..ca63e384e6 100644
--- a/mkspecs/features/default_pre.prf
+++ b/mkspecs/features/default_pre.prf
@@ -12,6 +12,9 @@ CONFIG = lex yacc warn_on debug exceptions $$CONFIG
                 cache(QMAKEMODULES, add super, modpath)
             unset(modpath)
         }
+    } else {
+        # When doing a build without -prefix, put the headers directly into qtbase.
+        isEmpty(MODULE_BASE_OUTDIR): MODULE_BASE_OUTDIR = $$[QT_HOST_DATA]
     }
 
     qtPrepareTool(QMAKE_SYNCQT, syncqt)
-- 
cgit v1.2.3