aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2015-05-02 14:24:26 -0700
committerJake Petroules <jake.petroules@petroules.com>2015-05-04 11:34:31 +0000
commitd2aa95c50c6b884905ed93484f4d3b0b39ef68c5 (patch)
tree0caceb92ce275fa56ca0428616e594b34329dfc3
parent15a64cec8b3ca7111fa631861fce8227a9a3dda8 (diff)
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>
-rw-r--r--src/app/qbs/commandlinefrontend.cpp1
-rw-r--r--src/lib/corelib/corelib.qbs2
-rw-r--r--src/lib/corelib/qbs.h1
-rw-r--r--src/lib/corelib/tools/tools.pri1
4 files changed, 3 insertions, 2 deletions
diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp
index c4ec96b04..3602d410d 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 a5fb92a37..8dca80dbd 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 73bea54ec..8b5bfe64e 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 3bf459d86..17beb63a9 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 \