Backport konsole changes to fix memory leaks

Fixes #58
2016-01-30 12:00:17 +03:00
parent a3ab230753
commit ef451424d7
4 changed files with 5 additions and 13 deletions
@@ -777,12 +777,8 @@ const ColorScheme* ColorSchemeManager::findColorScheme(const QString& name)
        return 0;
    }
 }
-
-ColorSchemeManager* ColorSchemeManager::theColorSchemeManager = 0;
-//K_GLOBAL_STATIC( ColorSchemeManager , theColorSchemeManager )
+Q_GLOBAL_STATIC(ColorSchemeManager, theColorSchemeManager)
 ColorSchemeManager* ColorSchemeManager::instance()
 {
-    if (! theColorSchemeManager)
-        theColorSchemeManager = new ColorSchemeManager();
    return theColorSchemeManager;
 }