src/gui/kernel/qguiplatformplugin.cpp
changeset 3 41300fa6a67c
parent 0 1918ee327afb
child 4 3b1da2848fc7
equal deleted inserted replaced
2:56cd8111b7f7 3:41300fa6a67c
    57 extern bool qt_wince_is_pocket_pc();  //qguifunctions_wince.cpp
    57 extern bool qt_wince_is_pocket_pc();  //qguifunctions_wince.cpp
    58 #endif
    58 #endif
    59 
    59 
    60 
    60 
    61 #if defined(Q_WS_X11)
    61 #if defined(Q_WS_X11)
    62 #include "qkde_p.h"
    62 #include <private/qkde_p.h>
    63 #include "qt_x11_p.h"
    63 #include <private/qgtkstyle_p.h>
    64 #include <private/gtksymbols_p.h>
    64 #include <private/qt_x11_p.h>
    65 #endif
    65 #endif
    66 
    66 
    67 
    67 
    68 QT_BEGIN_NAMESPACE
    68 QT_BEGIN_NAMESPACE
    69 
    69 
   204     QString result;
   204     QString result;
   205 #ifdef Q_WS_X11
   205 #ifdef Q_WS_X11
   206     if (X11->desktopEnvironment == DE_GNOME) {
   206     if (X11->desktopEnvironment == DE_GNOME) {
   207         result = QString::fromLatin1("gnome");
   207         result = QString::fromLatin1("gnome");
   208 #ifndef QT_NO_STYLE_GTK
   208 #ifndef QT_NO_STYLE_GTK
   209         result = QGtk::getGConfString(QLatin1String("/desktop/gnome/interface/icon_theme"), result);
   209         result = QGtkStylePrivate::getGConfString(QLatin1String("/desktop/gnome/interface/icon_theme"), result);
   210 #endif
   210 #endif
   211     } else if (X11->desktopEnvironment == DE_KDE) {
   211     } else if (X11->desktopEnvironment == DE_KDE) {
   212         result =  X11->desktopVersion >= 4 ? QString::fromLatin1("oxygen") : QString::fromLatin1("crystalsvg");
   212         result =  X11->desktopVersion >= 4 ? QString::fromLatin1("oxygen") : QString::fromLatin1("crystalsvg");
   213         QSettings settings(QKde::kdeHome() + QLatin1String("/share/config/kdeglobals"), QSettings::IniFormat);
   213         QSettings settings(QKde::kdeHome() + QLatin1String("/share/config/kdeglobals"), QSettings::IniFormat);
   214         settings.beginGroup(QLatin1String("Icons"));
   214         settings.beginGroup(QLatin1String("Icons"));
   286                 ret = QKde::kdeToolBarIconSize();
   286                 ret = QKde::kdeToolBarIconSize();
   287             }
   287             }
   288 #endif
   288 #endif
   289             //by default keep ret = 0 so QCommonStyle will use the style default
   289             //by default keep ret = 0 so QCommonStyle will use the style default
   290             break;
   290             break;
       
   291         default:
       
   292             break;
   291     }
   293     }
   292     return ret;
   294     return ret;
   293 }
   295 }
   294 
   296 
   295 
   297