diff --git a/krita/image/kis_bookmarked_configuration_manager.cc b/krita/image/kis_bookmarked_configuration_manager.cc
index 33bebe4c01828461fed35e8bf426477d90de8caa..fc5cea47b77d0a53229bb1509a4d90473b0baa06 100644
--- a/krita/image/kis_bookmarked_configuration_manager.cc
+++ b/krita/image/kis_bookmarked_configuration_manager.cc
@@ -32,8 +32,8 @@
 #include "kis_serializable_configuration.h"
 
 
-const char* const KisBookmarkedConfigurationManager::ConfigDefault = "Default";
-const char* const KisBookmarkedConfigurationManager::ConfigLastUsed = "Last Used";
+const char KisBookmarkedConfigurationManager::ConfigDefault[] = "Default";
+const char KisBookmarkedConfigurationManager::ConfigLastUsed[] = "Last Used";
 
 struct KisBookmarkedConfigurationManager::Private {
 
diff --git a/krita/image/kis_bookmarked_configuration_manager.h b/krita/image/kis_bookmarked_configuration_manager.h
index c02f99bf73e5bb07a43829727611d746d2f26520..fd5e99de4c4cfc25f063951cea388f9484c64e81 100644
--- a/krita/image/kis_bookmarked_configuration_manager.h
+++ b/krita/image/kis_bookmarked_configuration_manager.h
@@ -32,8 +32,8 @@ class KLocalizedString;
 class KRITAIMAGE_EXPORT KisBookmarkedConfigurationManager
 {
 public:
-    static const char* const ConfigDefault;
-    static const char* const ConfigLastUsed;
+    static const char ConfigDefault[];
+    static const char ConfigLastUsed[];
 public:
     /**
      * @param configEntryGroup name of the configuration entry with the
diff --git a/libs/main/KoFilterChainLink.cpp b/libs/main/KoFilterChainLink.cpp
index 7cfb28437c24d56df975b4d9c5a9023c631eacb9..95d848a4d7a77936b81736ffced34c9b26a95348 100644
--- a/libs/main/KoFilterChainLink.cpp
+++ b/libs/main/KoFilterChainLink.cpp
@@ -26,9 +26,9 @@ Boston, MA 02110-1301, USA.
 
 namespace
 {
-    const char *const SIGNAL_PREFIX = "commSignal";
+    const char SIGNAL_PREFIX[] = "commSignal";
     const int SIGNAL_PREFIX_LEN = 10;
-    const char *const SLOT_PREFIX = "commSlot";
+    const char SLOT_PREFIX[] = "commSlot";
     const int SLOT_PREFIX_LEN = 8;
 
     KoUpdater *createUpdater(KoFilterChain *chain)
diff --git a/libs/odf/KoStore.cpp b/libs/odf/KoStore.cpp
index b637146cdd066bb5a3a02c6cd0cb62a5ecc82185..4112cf0c56fafd8710d8c871f3e52042d9312714 100644
--- a/libs/odf/KoStore.cpp
+++ b/libs/odf/KoStore.cpp
@@ -186,8 +186,8 @@ KoStore* KoStore::createStore(QWidget* window, const KUrl& url, Mode mode, const
 
 namespace
 {
-const char* const ROOTPART = "root";
-const char* const MAINNAME = "maindoc.xml";
+const char ROOTPART[] = "root";
+const char MAINNAME[] = "maindoc.xml";
 }
 
 KoStore::KoStore(Mode mode, bool writeMimetype)
diff --git a/libs/odf/tests/TestStorage.cpp b/libs/odf/tests/TestStorage.cpp
index 98f3af8e873e9b334109660c10d815f2366b735f..e38caffabd47e81a90361284f7ec7f1138f0f1e9 100644
--- a/libs/odf/tests/TestStorage.cpp
+++ b/libs/odf/tests/TestStorage.cpp
@@ -68,14 +68,14 @@ void TestStorage::storage_data()
 
 void TestStorage::storage()
 {
-    const char* const test1 = "This test checks whether we're able to write to some arbitrary directory.\n";
-    const char* const testDir = "0";
-    const char* const testDirResult = "0/";
-    const char* const test2 = "This time we try to append the given relative path to the current dir.\n";
-    const char* const test3 = "<xml>Hello World</xml>";
-    const char* const testDir2 = "test2/with/a";
-    const char* const testDir2Result = "0/test2/with/a/";
-    const char* const test4 = "<xml>Heureka, it works</xml>";
+    const char test1[] = "This test checks whether we're able to write to some arbitrary directory.\n";
+    const char testDir[] = "0";
+    const char testDirResult[] = "0/";
+    const char test2[] = "This time we try to append the given relative path to the current dir.\n";
+    const char test3[] = "<xml>Hello World</xml>";
+    const char testDir2[] = "test2/with/a";
+    const char testDir2Result[] = "0/test2/with/a/";
+    const char test4[] = "<xml>Heureka, it works</xml>";
 
     QFETCH(int, type);
     QFETCH(QString, testFile);