diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-02-19 20:07:12 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2014-02-20 12:18:19 +0100 |
| commit | 3906a6af1bf97fa1a688ae6ed7d56553472090f1 (patch) | |
| tree | 3c2464224af0962e0c36860a710a19379caab607 | |
| parent | 9141e257f9e4772ec3c8321814e894b149f1d865 (diff) | |
| download | qt-creator-3906a6af1bf97fa1a688ae6ed7d56553472090f1.tar.gz | |
Fix qbs build
Change-Id: Ia46ac9dfa010e623d71e77c50f84517db71338ec
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs | 1 | ||||
| -rw-r--r-- | src/plugins/resourceeditor/resourceeditor.qbs | 3 | ||||
| -rw-r--r-- | src/plugins/resourceeditor/resourcenode.cpp | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs index 02ed30622a..e41dfdc770 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 a1199be38a..3ed9ee3226 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 e8b798f3de..f919a0742b 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 <utils/fileutils.h> |