summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2009-06-12 23:37:51 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-06-13 00:21:03 (GMT)
commit50aa24deadf43bdbfca5b3dd472a99aff8e3f09b (patch)
tree7d5a68dc089be792e124d9f5cfded9df03a6912c
parentd3f57ee3077ba0c4b21997acecfe2bab82ed6c1f (diff)
downloadQt-50aa24deadf43bdbfca5b3dd472a99aff8e3f09b.zip
Qt-50aa24deadf43bdbfca5b3dd472a99aff8e3f09b.tar.gz
Qt-50aa24deadf43bdbfca5b3dd472a99aff8e3f09b.tar.bz2
Fixed compile of Qt/Embedded.
Fixes compile error: kernel/qapplication_qws.cpp: In static member function 'static bool QApplicationPrivate::qws_apply_settings()': kernel/qapplication_qws.cpp:2014: error: no match for 'operator!' in '!QApplicationPrivate::styleOverride' kernel/qapplication_qws.cpp:2014: note: candidates are: operator!(bool) <built-in>
-rw-r--r--src/gui/kernel/qapplication_qws.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_qws.cpp b/src/gui/kernel/qapplication_qws.cpp
index ea52e11..edae670 100644
--- a/src/gui/kernel/qapplication_qws.cpp
+++ b/src/gui/kernel/qapplication_qws.cpp
@@ -2011,8 +2011,8 @@ bool QApplicationPrivate::qws_apply_settings()
// read new QStyle
QString stylename = settings.value(QLatin1String("style")).toString();
if (QCoreApplication::startingUp()) {
- if (!stylename.isEmpty() && !QApplicationPrivate::styleOverride)
- QApplicationPrivate::styleOverride = new QString(stylename);
+ if (!stylename.isEmpty() && QApplicationPrivate::styleOverride.isNull())
+ QApplicationPrivate::styleOverride = stylename;
} else {
QApplication::setStyle(stylename);
}