From 2ba93a4719272c7da5cddf2d4867bf5732cf8f11 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Thu, 7 Jun 2018 14:41:53 +0200
Subject: Fix Windows build with QtScript-less Qt

As we're building our own QtScript statically, we must override the
export macros of QtScript.

Change-Id: I9395e59cfcc1905b7b248b81277ec5fcfed9059f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/lib/corelib/corelib.qbs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/lib/corelib/corelib.qbs')

diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
index fd25d30e0..08733b624 100644
--- a/src/lib/corelib/corelib.qbs
+++ b/src/lib/corelib/corelib.qbs
@@ -17,7 +17,9 @@ QbsLibrary {
     Depends { condition: qbsbuildconfig.enableProjectFileUpdates; name: "Qt.gui" }
     Depends { condition: staticBuild; productTypes: ["qbsplugin"] }
     name: "qbscore"
-    cpp.includePaths: base.concat([
+    property stringList bundledQtScriptIncludes: qbsbuildconfig.useBundledQtScript
+            || !Qt.script.present ? qbsscriptengine.includePaths : []
+    cpp.includePaths: base.concat(bundledQtScriptIncludes).concat([
         ".",
         "../.." // for the plugin headers
     ])
-- 
cgit v1.2.3