summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/qbs/files/1.4.0-install-missing-header.patch')
-rw-r--r--dev-util/qbs/files/1.4.0-install-missing-header.patch75
1 files changed, 75 insertions, 0 deletions
diff --git a/dev-util/qbs/files/1.4.0-install-missing-header.patch b/dev-util/qbs/files/1.4.0-install-missing-header.patch
new file mode 100644
index 000000000000..3af545f16de9
--- /dev/null
+++ b/dev-util/qbs/files/1.4.0-install-missing-header.patch
@@ -0,0 +1,75 @@
+From d2aa95c50c6b884905ed93484f4d3b0b39ef68c5 Mon Sep 17 00:00:00 2001
+From: Jake Petroules <jake.petroules@petroules.com>
+Date: Sat, 2 May 2015 14:24:26 -0700
+Subject: Install headers necessary for Qt Creator to build with
+ QBS_INSTALL_DIR.
+
+Task-number: QBS-792
+Change-Id: I4930970c97176d6598a780e917eeb8ccc17124ce
+Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
+---
+ src/app/qbs/commandlinefrontend.cpp | 1 +
+ src/lib/corelib/corelib.qbs | 2 +-
+ src/lib/corelib/qbs.h | 1 -
+ src/lib/corelib/tools/tools.pri | 1 +
+ 4 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp
+index c4ec96b..3602d41 100644
+--- a/src/app/qbs/commandlinefrontend.cpp
++++ b/src/app/qbs/commandlinefrontend.cpp
+@@ -39,6 +39,7 @@
+ #include <api/runenvironment.h>
+ #include <logging/translator.h>
+ #include <tools/qbsassert.h>
++#include <tools/projectgeneratormanager.h>
+
+ #include <QDir>
+ #include <QFile>
+diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
+index a5fb92a..8dca80d 100644
+--- a/src/lib/corelib/corelib.qbs
++++ b/src/lib/corelib/corelib.qbs
+@@ -304,7 +304,6 @@ QbsLibrary {
+ "cleanoptions.cpp",
+ "codelocation.cpp",
+ "commandechomode.cpp",
+- "commandechomode.h",
+ "error.cpp",
+ "executablefinder.cpp",
+ "executablefinder.h",
+@@ -356,6 +355,7 @@ QbsLibrary {
+ "buildoptions.h",
+ "cleanoptions.h",
+ "codelocation.h",
++ "commandechomode.h",
+ "error.h",
+ "generateoptions.h",
+ "installoptions.h",
+diff --git a/src/lib/corelib/qbs.h b/src/lib/corelib/qbs.h
+index 73bea54..8b5bfe6 100644
+--- a/src/lib/corelib/qbs.h
++++ b/src/lib/corelib/qbs.h
+@@ -41,7 +41,6 @@
+ #include "tools/cleanoptions.h"
+ #include "tools/error.h"
+ #include "tools/generateoptions.h"
+-#include "tools/projectgeneratormanager.h"
+ #include "tools/installoptions.h"
+ #include "tools/preferences.h"
+ #include "tools/profile.h"
+diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri
+index 3bf459d..17beb63 100644
+--- a/src/lib/corelib/tools/tools.pri
++++ b/src/lib/corelib/tools/tools.pri
+@@ -86,6 +86,7 @@ qbs_enable_unit_tests {
+ $$PWD/architectures.h \
+ $$PWD/cleanoptions.h \
+ $$PWD/codelocation.h \
++ $$PWD/commandechomode.h \
+ $$PWD/error.h \
+ $$PWD/settings.h \
+ $$PWD/settingsmodel.h \
+--
+2.4.0
+