diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-05-16 10:09:15 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-16 10:09:15 +0200 |
| commit | ccefc5cf471ae68f44d25f8533fd0e0c44fb8bf8 (patch) | |
| tree | a143737514a07c071df395d54ae23666773b264c /src/plugins/qnx/qnxconstants.h | |
| parent | 5cd1bb6f73bcf2fbe5d514d69cec372a672afdd8 (diff) | |
| parent | 23ac1d18e1be8d898adf44dde745ba7c259beb3c (diff) | |
| download | qt-creator-ccefc5cf471ae68f44d25f8533fd0e0c44fb8bf8.tar.gz | |
Merge remote-tracking branch 'origin/4.6' into 4.7
Conflicts:
src/plugins/qnx/qnxplugin.cpp
Change-Id: I8ede5fa9c8daf3001e41fcba7cbee68edb9db3a6
Diffstat (limited to 'src/plugins/qnx/qnxconstants.h')
| -rw-r--r-- | src/plugins/qnx/qnxconstants.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qnx/qnxconstants.h b/src/plugins/qnx/qnxconstants.h index f65dcf30c7..ecd31d6b3d 100644 --- a/src/plugins/qnx/qnxconstants.h +++ b/src/plugins/qnx/qnxconstants.h @@ -39,6 +39,8 @@ const char QNX_QNX_FEATURE[] = "QtSupport.Wizards.FeatureQNX"; const char QNX_QNX_RUNCONFIGURATION_PREFIX[] = "Qt4ProjectManager.QNX.QNXRunConfiguration."; +const char QNX_QNX_DEPLOYCONFIGURATION_ID[] = "Qt4ProjectManager.QNX.QNXDeployConfiguration"; + const char QNX_QNX_OS_TYPE[] = "QnxOsType"; const char QNX_DEBUG_EXECUTABLE[] = "pdebug"; |