diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-04 06:29:46 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-04 06:29:46 (GMT) |
| commit | 1400ce5b85fbe7c67899f5f62bfd276eecb21ae0 (patch) | |
| tree | ccc72723d2305b4d24f9ec296e6d9ee7d3d9d16a /src/gui/kernel/qguiplatformplugin.cpp | |
| parent | 867be3fd7a2017377e8ae5cc3ab789b3b01733bd (diff) | |
| parent | be71186962db5974113e89b0e7c7aa1ab3987379 (diff) | |
| download | Qt-1400ce5b85fbe7c67899f5f62bfd276eecb21ae0.zip Qt-1400ce5b85fbe7c67899f5f62bfd276eecb21ae0.tar.gz Qt-1400ce5b85fbe7c67899f5f62bfd276eecb21ae0.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/kernel/qguiplatformplugin.cpp')
| -rw-r--r-- | src/gui/kernel/qguiplatformplugin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qguiplatformplugin.cpp b/src/gui/kernel/qguiplatformplugin.cpp index b01d40f..e6efec1 100644 --- a/src/gui/kernel/qguiplatformplugin.cpp +++ b/src/gui/kernel/qguiplatformplugin.cpp @@ -59,9 +59,9 @@ extern bool qt_wince_is_pocket_pc(); //qguifunctions_wince.cpp #if defined(Q_WS_X11) -#include "qkde_p.h" -#include "qt_x11_p.h" -#include <private/gtksymbols_p.h> +#include <private/qkde_p.h> +#include <private/qgtkstyle_p.h> +#include <private/qt_x11_p.h> #endif @@ -206,7 +206,7 @@ QString QGuiPlatformPlugin::systemIconThemeName() 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"); |