diff options
| author | jasplin <qt-info@nokia.com> | 2009-06-23 10:25:01 (GMT) |
|---|---|---|
| committer | jasplin <qt-info@nokia.com> | 2009-06-23 10:33:11 (GMT) |
| commit | b9847fa61f8c14a9b54a137b917bcf0ab072ca1c (patch) | |
| tree | 614843181fc3d1760d90cf6855a3e65b0322e666 | |
| parent | e1eceedaa635d0180eb798b00c3da93156d7af63 (diff) | |
| download | Qt-b9847fa61f8c14a9b54a137b917bcf0ab072ca1c.zip Qt-b9847fa61f8c14a9b54a137b917bcf0ab072ca1c.tar.gz Qt-b9847fa61f8c14a9b54a137b917bcf0ab072ca1c.tar.bz2 | |
Fixed build error on X11 with gcc 4.1.2.
gcc 4.1.2 on X11 somehow confuses assignment of a temporarily
constructed QSettings object to a reference with invalid access
to the private assignment operator of QSettings.
Reviewed-by: mgoetz
| -rw-r--r-- | src/gui/kernel/qapplication_x11.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index babc5df..2704987 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -1305,9 +1305,9 @@ 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); + const QSettings theKdeSettings( + QApplicationPrivate::kdeHome() + + QLatin1String("/share/config/kdeglobals"), QSettings::IniFormat); // Setup KDE palette QColor color; @@ -1357,9 +1357,9 @@ 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); + const QSettings theKdeSettings( + QApplicationPrivate::kdeHome() + + QLatin1String("/share/config/kdeglobals"), QSettings::IniFormat); QColor color = kdeColor(QLatin1String("selectBackground"), theKdeSettings); if (!color.isValid()) |