diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-02 18:42:05 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-02 18:42:05 +0100 |
| commit | 100ea30a1a5ccb0af4adafbf08b8fa89fe3c0ee7 (patch) | |
| tree | 0b2aca7b1533ac466e7d2312a6bd3fa1a0282ea1 /src/plugins/cpptools/cppprojects.h | |
| parent | f86ebcbf22d7df6be60f1fc5c9f0f30a76e104d6 (diff) | |
| parent | e4be9edc4d538465338b8981294aa414a43b7255 (diff) | |
| download | qt-creator-100ea30a1a5ccb0af4adafbf08b8fa89fe3c0ee7.tar.gz | |
Merge remote-tracking branch 'origin/3.6'
Conflicts:
src/plugins/projectexplorer/toolchainmanager.cpp
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
Change-Id: Id736c6922670c921c689219cb817b1541eaaf304
Diffstat (limited to 'src/plugins/cpptools/cppprojects.h')
| -rw-r--r-- | src/plugins/cpptools/cppprojects.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppprojects.h b/src/plugins/cpptools/cppprojects.h index a63f557587..3d8ddba0be 100644 --- a/src/plugins/cpptools/cppprojects.h +++ b/src/plugins/cpptools/cppprojects.h @@ -247,6 +247,4 @@ private: } // namespace CppTools -Q_DECLARE_METATYPE(CppTools::ProjectPart::Ptr) - #endif // CPPPROJECTPART_H |