summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@digia.com>2013-01-15 16:33:12 +0100
committerTobias Hunger <tobias.hunger@digia.com>2013-01-24 15:11:21 +0100
commit4709b5883eb1e22c8da42dde0e0457c3ebe495ce (patch)
tree3a7964d3499750ade78d00df1faa1614a3630e6b
parent47b51c2070c141ca254176769e8c0e4ff180378c (diff)
downloadqt-creator-4709b5883eb1e22c8da42dde0e0457c3ebe495ce.tar.gz
Qbs: Fix build on windows
Change-Id: I7302f24a8ed30eed2febd7ec0ab7b4e218dc5aad
-rw-r--r--src/plugins/qbsprojectmanager/qbsparser.h4
-rw-r--r--src/plugins/qbsprojectmanager/qbsprojectmanager.pro4
2 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsparser.h b/src/plugins/qbsprojectmanager/qbsparser.h
index 7e50c61949..395b576464 100644
--- a/src/plugins/qbsprojectmanager/qbsparser.h
+++ b/src/plugins/qbsprojectmanager/qbsparser.h
@@ -30,6 +30,8 @@
#ifndef QBSPARSER_H
#define QBSPARSER_H
+#include "qbsprojectmanager_global.h"
+
#include <projectexplorer/ioutputparser.h>
#include <QDir>
@@ -37,7 +39,7 @@
namespace QbsProjectManager {
namespace Internal {
-class PROJECTEXPLORER_EXPORT QbsParser : public ProjectExplorer::IOutputParser
+class QBSPROJECTMANAGER_EXPORT QbsParser : public ProjectExplorer::IOutputParser
{
Q_OBJECT
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
index 53fa456cd1..215d69a2e2 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
@@ -17,6 +17,10 @@ include($$QBS_SOURCE_DIR/src/lib/use.pri)
DEFINES += QBS_SOURCE_DIR=\\\"$$QBS_SOURCE_DIR\\\"
DEFINES += QBS_BUILD_DIR=\\\"$$QBS_BUILD_DIR\\\"
+DEFINES += \
+ QT_CREATOR \
+ QBSPROJECTMANAGER_LIBRARY \
+ QT_NO_CAST_FROM_ASCII
HEADERS = \
qbsbuildconfiguration.h \