diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-01-20 17:01:07 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-01-21 17:25:00 +0100 |
| commit | eaf75253b4234815ad045c6b7b21e86d9f53bf68 (patch) | |
| tree | 84316a47e67cbd9c38a13b13acdef33ccaa3bc42 /src/plugins/qbsprojectmanager/qbsconstants.h | |
| parent | d72059b1fe76b7ff8a8eccc72a92c512d36ec9f3 (diff) | |
| download | qt-creator-eaf75253b4234815ad045c6b7b21e86d9f53bf68.tar.gz | |
Update qbs submodule to HEAD of master branch.
Includes some necessary adaptations to the QbsProjectManager plugin,
namely:
- Use the new library for setting up Qt profiles.
- Use per-profile preferences.
Change-Id: I0a639bd291d790c6da9cb4ade53841314310d5ef
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/qbsprojectmanager/qbsconstants.h')
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsconstants.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsconstants.h b/src/plugins/qbsprojectmanager/qbsconstants.h index 526de096dd..40f8f4767d 100644 --- a/src/plugins/qbsprojectmanager/qbsconstants.h +++ b/src/plugins/qbsprojectmanager/qbsconstants.h @@ -33,22 +33,6 @@ namespace QbsProjectManager { namespace Constants { -// Qt related settings: -const char QTCORE_BINPATH[] = "Qt.core.binPath"; -const char QTCORE_BUILDVARIANT[] = "Qt.core.buildVariant"; -const char QTCORE_DOCPATH[] = "Qt.core.docPath"; -const char QTCORE_INCPATH[] = "Qt.core.incPath"; -const char QTCORE_LIBPATH[] = "Qt.core.libPath"; -const char QTCORE_PLUGINPATH[] = "Qt.core.pluginPath"; -const char QTCORE_VERSION[] = "Qt.core.version"; -const char QTCORE_NAMESPACE[] = "Qt.core.namespace"; -const char QTCORE_LIBINFIX[] = "Qt.core.libInfix"; -const char QTCORE_MKSPEC[] = "Qt.core.mkspecPath"; -const char QTCORE_FRAMEWORKBUILD[] = "Qt.core.frameworkBuild"; -const char QTCORE_CONFIG[] = "Qt.core.config"; -const char QTCORE_QTCONFIG[] = "Qt.core.qtConfig"; - - // Toolchain related settings: const char QBS_TARGETOS[] = "qbs.targetOS"; const char QBS_SYSROOT[] = "qbs.sysroot"; |