Fix some issues preventing Qbs from being built in amalgamation mode

Change-Id: Icdfe9c9e3005aaa53922d1bcf58b8e2dac840099
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

5 files changed, 8 insertions, 4 deletions

diff --git a/src/app/qbs-create-project/createproject.h b/src/app/qbs-create-project/createproject.h
index 4a44e6b15..95df434d9 100644
--- a/src/app/qbs-create-project/createproject.h
+++ b/src/app/qbs-create-project/createproject.h
@@ -37,6 +37,9 @@
 **
 ****************************************************************************/
 
+#ifndef QBS_CREATEPROJECT_H
+#define QBS_CREATEPROJECT_H
+
 #include <QtCore/qflags.h>
 #include <QtCore/qhash.h>
 #include <QtCore/qregexp.h>
@@ -83,3 +86,5 @@ private:
     QList<QRegExp> m_whiteList;
     QList<QRegExp> m_blackList;
 };
+
+#endif // QBS_CREATEPROJECT_H
diff --git a/src/lib/corelib/buildgraph/buildgraph.cpp b/src/lib/corelib/buildgraph/buildgraph.cpp
index d4179aec3..a7d7f9c8e 100644
--- a/src/lib/corelib/buildgraph/buildgraph.cpp
+++ b/src/lib/corelib/buildgraph/buildgraph.cpp
@@ -92,7 +92,7 @@ static void setupProductScriptValue(ScriptEngine *engine, QScriptValue &productS
                                     const ResolvedProduct *product,
                                     PrepareScriptObserver *observer);
 
-enum ScriptValueCommonPropertyKeys : quint32 {
+enum BuildGraphScriptValueCommonPropertyKeys : quint32 {
     CachedValueKey,
     FileTagKey
 };
diff --git a/src/lib/corelib/buildgraph/forward_decls.h b/src/lib/corelib/buildgraph/forward_decls.h
index fe35cd89a..4f84041af 100644
--- a/src/lib/corelib/buildgraph/forward_decls.h
+++ b/src/lib/corelib/buildgraph/forward_decls.h
@@ -48,7 +48,6 @@ class Artifact;
 class BuildGraphNode;
 class ProjectBuildData;
 class ProductBuildData;
-class Node;
 
 class Transformer;
 typedef std::shared_ptr<Transformer> TransformerPtr;
diff --git a/src/lib/corelib/jsextensions/moduleproperties.cpp b/src/lib/corelib/jsextensions/moduleproperties.cpp
index d726dc7e6..03e2c1b21 100644
--- a/src/lib/corelib/jsextensions/moduleproperties.cpp
+++ b/src/lib/corelib/jsextensions/moduleproperties.cpp
@@ -54,7 +54,7 @@
 namespace qbs {
 namespace Internal {
 
-enum ScriptValueCommonPropertyKeys : quint32
+enum ModulePropertiesScriptValueCommonPropertyKeys : quint32
 {
     ModuleNameKey,
     ProductPtrKey,
diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp
index f59b557f8..3918db6ce 100644
--- a/src/lib/corelib/tools/settingsmodel.cpp
+++ b/src/lib/corelib/tools/settingsmodel.cpp
@@ -206,7 +206,7 @@ Qt::ItemFlags SettingsModel::flags(const QModelIndex &index) const
 {
     if (!index.isValid())
         return Qt::ItemFlags();
-    const Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+    const Qt::ItemFlags flags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
     if (index.column() == keyColumn()) {
         if (d->editable)
             return flags | Qt::ItemIsEditable;