feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	src/plugins/clangcodemodel/test/clangcompletion_test.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/projectexplorer/projectexplorer.pro
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
	src/plugins/vcsbase/vcsplugin.cpp
	src/shared/qbs

Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
This commit is contained in:
Eike Ziller
2014-05-16 16:54:50 +02:00
parent d46a73eacf 1398480f3a
commit 6d1cc58697
64 changed files with 1227 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/generatorinfo.cpp
View File

@@ -35,6 +35,7 @@
#include <projectexplorer/kitinformation.h>
#include <remotelinux/remotelinux_constants.h>
#include <qnx/qnxconstants.h>
namespace CMakeProjectManager {
namespace Internal {
@@ -125,7 +126,9 @@ QList<GeneratorInfo> GeneratorInfo::generatorInfosFor(ProjectExplorer::Kit *k, N
return results;
Core::Id deviceType = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(k);
if (deviceType != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE
&& deviceType != RemoteLinux::Constants::GenericLinuxOsType)
&& deviceType != RemoteLinux::Constants::GenericLinuxOsType
&& deviceType != Qnx::Constants::QNX_QNX_OS_TYPE
&& deviceType != Qnx::Constants::QNX_BB_OS_TYPE)
return results;
ProjectExplorer::Abi targetAbi = tc->targetAbi();
if (n != ForceNinja) {