diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-23 09:25:31 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-23 09:25:31 (GMT) |
| commit | 68e72ecac7afda1569011d67df8f7f8e250c42f5 (patch) | |
| tree | 138203a768413bfdfa307ea561a1a8ef0d349de5 /src/gui/kernel | |
| parent | b62f4db7526a5b0794940ac358f287398225a411 (diff) | |
| parent | f11f41fe9e507d1f3eb8994960f0226f229bc76c (diff) | |
| download | Qt-68e72ecac7afda1569011d67df8f7f8e250c42f5.zip Qt-68e72ecac7afda1569011d67df8f7f8e250c42f5.tar.gz Qt-68e72ecac7afda1569011d67df8f7f8e250c42f5.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multitouch
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication_x11.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 298f76b..76e76de 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -1311,9 +1311,7 @@ static void qt_set_x11_resources(const char* font = 0, const char* fg = 0, } if (kdeColors) { - const QSettings &theKdeSettings = - QSettings(QApplicationPrivate::kdeHome() - + QLatin1String("/share/config/kdeglobals"), QSettings::IniFormat); + QSettings theKdeSettings(QApplicationPrivate::kdeHome() + QLatin1String("/share/config/kdeglobals"), QSettings::IniFormat); // Setup KDE palette QColor color; @@ -1363,9 +1361,7 @@ static void qt_set_x11_resources(const char* font = 0, const char* fg = 0, } // Use KDE3 or KDE4 color settings if present if (kdeColors) { - const QSettings &theKdeSettings = - QSettings(QApplicationPrivate::kdeHome() - + QLatin1String("/share/config/kdeglobals"), QSettings::IniFormat); + QSettings theKdeSettings(QApplicationPrivate::kdeHome() + QLatin1String("/share/config/kdeglobals"), QSettings::IniFormat); QColor color = kdeColor(QLatin1String("selectBackground"), theKdeSettings); if (!color.isValid()) |