Only show the configuration of theme icons on X11

Also hide the ui items in the constructor to prevent flickering.

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 4d3e61c50f90992eca9219dd7cd9f6247f46f610..5a59521268fb39b1eb5fe4e08da724519e734168 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -2524,6 +2524,11 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form)
        iconSetCO->addItem(qt_("Default"), QString());
        iconSetCO->addItem(qt_("Classic"), "classic");
        iconSetCO->addItem(qt_("Oxygen"), "oxygen");
+
+#if (!defined Q_WS_X11 || QT_VERSION < 0x040600)
+       useSystemThemeIconsCB->hide();
+       themeIconsLA->hide();
+#endif
 }
 
 
@@ -2545,10 +2550,6 @@ void PrefUserInterface::update(LyXRC const & rc)
        if (iconset < 0)
                iconset = 0;
        iconSetCO->setCurrentIndex(iconset);
-#if (QT_VERSION < 0x040600)
-       useSystemThemeIconsCB->hide();
-       themeIconsLA->hide();
-#endif
        useSystemThemeIconsCB->setChecked(rc.use_system_theme_icons);
        uiFileED->setText(toqstr(external_path(rc.ui_file)));
        lastfilesSB->setValue(rc.num_lastfiles);