summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-06-23 06:46:01 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-06-23 06:46:01 (GMT)
commitf11f41fe9e507d1f3eb8994960f0226f229bc76c (patch)
treea0143c0abd0fe587611a822b66844c125527b104 /src/gui
parentfbe44b843194f3892e163ecec1be52fb498e2ddd (diff)
downloadQt-f11f41fe9e507d1f3eb8994960f0226f229bc76c.zip
Qt-f11f41fe9e507d1f3eb8994960f0226f229bc76c.tar.gz
Qt-f11f41fe9e507d1f3eb8994960f0226f229bc76c.tar.bz2
Compile with arm-linux-g++ 4.2.1 in scratchbox
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qapplication_x11.cpp8
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())