diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-04-02 18:30:29 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-04-02 18:30:29 (GMT) |
| commit | 86723ca856dbd07bc7809ed9c3f9a219a99e67bd (patch) | |
| tree | 5d6e8bb3c868283b35194a16387d9677ef5ee82e /src/gui | |
| parent | 00f2031c60bc472544b509586ee31c643ab2e81d (diff) | |
| parent | 87a711f1b32b737231c87a4b0cde986582ef8af5 (diff) | |
| download | Qt-86723ca856dbd07bc7809ed9c3f9a219a99e67bd.zip Qt-86723ca856dbd07bc7809ed9c3f9a219a99e67bd.tar.gz Qt-86723ca856dbd07bc7809ed9c3f9a219a99e67bd.tar.bz2 | |
Merge commit 'origin/4.5'
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qapplication_x11.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 6babda9..260a9a4 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -887,11 +887,15 @@ bool QApplicationPrivate::x11_apply_settings() } } + static QString currentStyleName = stylename; if (QCoreApplication::startingUp()) { if (!stylename.isEmpty() && !QApplicationPrivate::styleOverride) QApplicationPrivate::styleOverride = new QString(stylename); } else { - QApplication::setStyle(stylename); + if (currentStyleName != stylename) { + currentStyleName = stylename; + QApplication::setStyle(stylename); + } } int num = |