From c2f83e32651865dcd03b706b37ac92f4439ac889 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 6 Aug 2013 13:40:11 +0200 Subject: [PATCH] Fix build with qbs Change-Id: Iff654636522bd41e96dfae6183f95c4dfcb53829 Reviewed-by: Tobias Hunger --- src/libs/qmljs/qmljs.qbs | 2 ++ .../qmlprojectmanager/fileformat/qmlprojectfileformat.cpp | 3 +++ .../qmlprojectmanager/fileformat/qmlprojectfileformat.h | 5 ++++- src/plugins/qmlprojectmanager/qmlprojectmanager.qbs | 1 + src/plugins/qnx/qnx.qbs | 1 + 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs index 7029b1149f7..d30ad165835 100644 --- a/src/libs/qmljs/qmljs.qbs +++ b/src/libs/qmljs/qmljs.qbs @@ -66,6 +66,8 @@ QtcLibrary { "qmljsscopebuilder.h", "qmljsscopechain.cpp", "qmljsscopechain.h", + "qmljssimplereader.cpp", + "qmljssimplereader.h", "qmljsstaticanalysismessage.cpp", "qmljsstaticanalysismessage.h", "qmljstypedescriptionreader.cpp", diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp index b23f090e8bb..f08452a845d 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp @@ -32,6 +32,9 @@ #include "filefilteritems.h" #include +#include +#include + enum { debug = false }; diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.h b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.h index 782239b6822..6cc762a5a5e 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.h +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.h @@ -30,13 +30,16 @@ #ifndef QMLPROJECTFILEFORMAT_H #define QMLPROJECTFILEFORMAT_H +#include +#include + namespace QmlProjectManager { class QmlProjectItem; class QmlProjectFileFormat { - Q_DECLARE_TR_FUNCTIONS(QmlProjectManager::QmlProjectFileFormat); + Q_DECLARE_TR_FUNCTIONS(QmlProjectManager::QmlProjectFileFormat) public: static QmlProjectItem *parseProjectFile(const QString &fileName, QString *errorMessage = 0); diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs index eaf376ebc31..9735c31b495 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs @@ -12,6 +12,7 @@ QtcPlugin { Depends { name: "QmlJSEditor" } Depends { name: "QmlJS" } Depends { name: "QmlJSTools" } + Depends { name: "QmlDebug" } Depends { name: "Debugger" } Depends { name: "QtSupport" } Depends { name: "app_version_header" } diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs index 1b9b69908d2..eb53368cd61 100644 --- a/src/plugins/qnx/qnx.qbs +++ b/src/plugins/qnx/qnx.qbs @@ -9,6 +9,7 @@ QtcPlugin { Depends { name: "Core" } Depends { name: "Debugger" } Depends { name: "ProjectExplorer" } + Depends { name: "QmlDebug" } Depends { name: "QtSupport" } Depends { name: "Qt4ProjectManager" } Depends { name: "RemoteLinux" }