diff options
author | Harald Hvaal <harald.hvaal@gmail.com> | 2015-03-28 21:03:29 +0100 |
---|---|---|
committer | Harald Hvaal <harald.hvaal@gmail.com> | 2015-04-20 06:39:31 +0000 |
commit | 8fb881900c7bb7895e7a2109a7dc880954bcf3a9 (patch) | |
tree | a2c11493971ee18987960c41e40d61c5204db3cc /src/gui | |
parent | 6526a4e1367fa134ff29952fcbdd0d7cc937003f (diff) |
Enable checking for whether the system palette was explicitly set
In order to obey a palette set globally on QApplication, an application
attribute for checking if it's set at all is added.
Task-number: QTBUG-39800
Change-Id: I26b965e6e18e0e1ca4df03cf343b3527df3636b2
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 3e2b692cd0..926ec16f19 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -2757,6 +2757,7 @@ void QGuiApplication::setPalette(const QPalette &pal) else *QGuiApplicationPrivate::app_pal = pal; applicationResourceFlags |= ApplicationPaletteExplicitlySet; + QCoreApplication::setAttribute(Qt::AA_SetPalette); emit qGuiApp->paletteChanged(*QGuiApplicationPrivate::app_pal); } |