From 1526011f32ae5becdedcf4ee55e32bbcf5724bcb Mon Sep 17 00:00:00 2001 From: Joerg Bornemann <joerg.bornemann@digia.com> Date: Wed, 17 Apr 2013 14:16:22 +0200 Subject: [PATCH] update qbs submodule Also adjust the qbs plugin to changes. Change-Id: I26f9beca50ceac1fd6b64ca79fe9881096afa1ce Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> --- .../qbsprojectmanager/qbsprojectmanager.cpp | 14 +++++++------- src/shared/qbs | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp index 354fb8ba2c7..d4423696b85 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp @@ -53,13 +53,13 @@ const char PROFILE_LIST[] = "preferences.qtcreator.kit."; const char PROFILES_PREFIX[] = "profiles."; // Qt related settings: -const char QTCORE_BINPATH[] = ".qt.core.binPath"; -const char QTCORE_INCPATH[] = ".qt.core.incPath"; -const char QTCORE_LIBPATH[] = ".qt.core.libPath"; -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_BINPATH[] = ".Qt.core.binPath"; +const char QTCORE_INCPATH[] = ".Qt.core.incPath"; +const char QTCORE_LIBPATH[] = ".Qt.core.libPath"; +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"; // Toolchain related settings: diff --git a/src/shared/qbs b/src/shared/qbs index f17fd5d56a7..091dc267d35 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit f17fd5d56a758a28ef5da04b2be83ed558f7cba6 +Subproject commit 091dc267d3526e7b3d8e05b32a2506aea114f778 -- GitLab