diff -r 56cd8111b7f7 -r 41300fa6a67c src/gui/kernel/qguiplatformplugin.cpp --- a/src/gui/kernel/qguiplatformplugin.cpp Tue Jan 26 12:42:25 2010 +0200 +++ b/src/gui/kernel/qguiplatformplugin.cpp Tue Feb 02 00:43:10 2010 +0200 @@ -59,9 +59,9 @@ #if defined(Q_WS_X11) -#include "qkde_p.h" -#include "qt_x11_p.h" -#include +#include +#include +#include #endif @@ -206,7 +206,7 @@ if (X11->desktopEnvironment == DE_GNOME) { result = QString::fromLatin1("gnome"); #ifndef QT_NO_STYLE_GTK - result = QGtk::getGConfString(QLatin1String("/desktop/gnome/interface/icon_theme"), result); + result = QGtkStylePrivate::getGConfString(QLatin1String("/desktop/gnome/interface/icon_theme"), result); #endif } else if (X11->desktopEnvironment == DE_KDE) { result = X11->desktopVersion >= 4 ? QString::fromLatin1("oxygen") : QString::fromLatin1("crystalsvg"); @@ -288,6 +288,8 @@ #endif //by default keep ret = 0 so QCommonStyle will use the style default break; + default: + break; } return ret; }