summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin/coreplugin.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2014-11-17 08:07:28 +0200
committerOrgad Shaneh <orgads@gmail.com>2014-11-20 11:35:11 +0100
commit3ec16fe4d89bb8baa027d06de2b13f9a4755567c (patch)
tree01e995f380423c63b03fd234e74119c0d7feb3cf /src/plugins/coreplugin/coreplugin.cpp
parentab83c30f872cb1d02eb91ab75388fb3c4df656b3 (diff)
downloadqt-creator-3ec16fe4d89bb8baa027d06de2b13f9a4755567c.tar.gz
Theming: Store initial palette
Change-Id: Iea8b74534a59d8410814f9dd41225b88e1e81f75 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/coreplugin/coreplugin.cpp')
-rw-r--r--src/plugins/coreplugin/coreplugin.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index cd50daf04b..e84be25ac6 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -133,7 +133,7 @@ void CorePlugin::parseArguments(const QStringList &arguments)
theme->readSettings(themeSettings);
setCreatorTheme(theme);
if (theme->flag(Theme::ApplyThemePaletteGlobally))
- QApplication::setPalette(creatorTheme()->palette(QApplication::palette()));
+ QApplication::setPalette(creatorTheme()->palette());
// defer creation of these widgets until here,
// because they need a valid theme set
@@ -148,6 +148,7 @@ void CorePlugin::parseArguments(const QStringList &arguments)
bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
+ Theme::initialPalette(); // Initialize palette before setting it
qsrand(QDateTime::currentDateTime().toTime_t());
parseArguments(arguments);
const bool success = m_mainWindow->init(errorMessage);