From 21fd430db8e988d3bcffcf24ff6430e4bfe22fab Mon Sep 17 00:00:00 2001 From: Orgad Shaneh <orgad.shaneh@audiocodes.com> Date: Thu, 27 Jul 2017 23:13:48 +0300 Subject: [PATCH] QbsPM: De-static const strings in constants header Having a static variable in a header is strange. Change-Id: I42c0244f6e73f1cbf530e704a36b96bf5b85a017 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> --- .../qbsprojectmanagerconstants.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h b/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h index 3195bb8d65..e53beb84fe 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h @@ -60,19 +60,19 @@ const char QBS_CLEANSTEP_ID[] = "Qbs.CleanStep"; const char QBS_INSTALLSTEP_ID[] = "Qbs.InstallStep"; // QBS strings: -static const char QBS_VARIANT_DEBUG[] = "debug"; -static const char QBS_VARIANT_RELEASE[] = "release"; +const char QBS_VARIANT_DEBUG[] = "debug"; +const char QBS_VARIANT_RELEASE[] = "release"; -static const char QBS_CONFIG_VARIANT_KEY[] = "qbs.buildVariant"; -static const char QBS_CONFIG_PROFILE_KEY[] = "qbs.profile"; -static const char QBS_INSTALL_ROOT_KEY[] = "qbs.installRoot"; -static const char QBS_CONFIG_DECLARATIVE_DEBUG_KEY[] = "Qt.declarative.qmlDebugging"; -static const char QBS_CONFIG_QUICK_DEBUG_KEY[] = "Qt.quick.qmlDebugging"; +const char QBS_CONFIG_VARIANT_KEY[] = "qbs.buildVariant"; +const char QBS_CONFIG_PROFILE_KEY[] = "qbs.profile"; +const char QBS_INSTALL_ROOT_KEY[] = "qbs.installRoot"; +const char QBS_CONFIG_DECLARATIVE_DEBUG_KEY[] = "Qt.declarative.qmlDebugging"; +const char QBS_CONFIG_QUICK_DEBUG_KEY[] = "Qt.quick.qmlDebugging"; const char QBS_FORCE_PROBES_KEY[] = "qbspm.forceProbes"; // Icons: -static const char QBS_GROUP_ICON[] = ":/qbsprojectmanager/images/groups.png"; -static const char QBS_PRODUCT_OVERLAY_ICON[] = ":/qbsprojectmanager/images/productgear.png"; +const char QBS_GROUP_ICON[] = ":/qbsprojectmanager/images/groups.png"; +const char QBS_PRODUCT_OVERLAY_ICON[] = ":/qbsprojectmanager/images/productgear.png"; // Toolchain related settings: const char QBS_TARGETOS[] = "qbs.targetOS"; -- GitLab