diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs index 02ed30622a1..e41dfdc7707 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs @@ -16,6 +16,7 @@ QtcPlugin { Depends { name: "CppTools" } Depends { name: "TextEditor" } Depends { name: "QmlJSTools" } + Depends { name: "ResourceEditor" } pluginRecommends: [ "Designer" diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs index a1199be38ac..3ed9ee32263 100644 --- a/src/plugins/resourceeditor/resourceeditor.qbs +++ b/src/plugins/resourceeditor/resourceeditor.qbs @@ -7,10 +7,13 @@ QtcPlugin { Depends { name: "Qt"; submodules: ["widgets", "xml"] } Depends { name: "Aggregation" } + Depends { name: "ProjectExplorer" } Depends { name: "Utils" } Depends { name: "Core" } + cpp.defines: base.concat(["RESOURCE_LIBRARY"]) + Group { name: "General" files: [ diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp index e8b798f3de5..f919a0742ba 100644 --- a/src/plugins/resourceeditor/resourcenode.cpp +++ b/src/plugins/resourceeditor/resourcenode.cpp @@ -28,8 +28,8 @@ ****************************************************************************/ #include "resourcenode.h" -#include "resourcefile_p.h" #include "resourceeditorconstants.h" +#include "qrceditor/resourcefile_p.h" #include