diff options
| author | Panagiotis Papadopoulos <pano_90@gmx.net> | 2010-04-21 13:34:20 +0200 |
|---|---|---|
| committer | Panagiotis Papadopoulos <pano_90@gmx.net> | 2010-04-21 13:34:20 +0200 |
| commit | f9153663cb8210ac4d6e7055838344839b4e19b6 (patch) | |
| tree | b70233b32eadfbebff062c0000f007ca2f99d732 /src/settings/settings_webkit.ui | |
| parent | Merge branch 'master' of git://gitorious.org/rekonq/mainline into i18n (diff) | |
| parent | Nebulon's patch. (diff) | |
| download | rekonq-f9153663cb8210ac4d6e7055838344839b4e19b6.tar.xz | |
Merge branch 'master' of git://gitorious.org/rekonq/mainline into i18n
Diffstat (limited to 'src/settings/settings_webkit.ui')
| -rw-r--r-- | src/settings/settings_webkit.ui | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui index 5074522b..e424fd9c 100644 --- a/src/settings/settings_webkit.ui +++ b/src/settings/settings_webkit.ui @@ -148,13 +148,7 @@ </widget> </item> <item> - <widget class="QComboBox" name="kcfg_pluginsEnabled"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> + <widget class="KComboBox" name="kcfg_pluginsEnabled"> <item> <property name="text"> <string>Autoload Plugins</string> @@ -219,6 +213,11 @@ <extends>QFrame</extends> <header>kurlrequester.h</header> </customwidget> + <customwidget> + <class>KComboBox</class> + <extends>QComboBox</extends> + <header>kcombobox.h</header> + </customwidget> </customwidgets> <resources/> <connections/> |