From da5ce65b6bd031f66c32a0ee5124818af5c626da Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 26 Mar 2011 20:37:20 +0000
Subject: Fix keramic config uic-tqt segfault

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1226116 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kwin/clients/keramik/CMakeLists.txt          |  4 +---
 kwin/clients/keramik/config/keramikconfig.ui | 12 ++++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'kwin/clients')

diff --git a/kwin/clients/keramik/CMakeLists.txt b/kwin/clients/keramik/CMakeLists.txt
index 4de0912eb..851f44a9a 100644
--- a/kwin/clients/keramik/CMakeLists.txt
+++ b/kwin/clients/keramik/CMakeLists.txt
@@ -9,9 +9,7 @@
 #
 #################################################
 
-if( NOT WITH_QT4 )
-  add_subdirectory( config )
-endif( NOT WITH_QT4 )
+add_subdirectory( config )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kwin/clients/keramik/config/keramikconfig.ui b/kwin/clients/keramik/config/keramikconfig.ui
index f24d15952..dda8d5b5f 100644
--- a/kwin/clients/keramik/config/keramikconfig.ui
+++ b/kwin/clients/keramik/config/keramikconfig.ui
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KeramikConfigUI</class>
 <widget class="TQWidget">
     <property name="name">
@@ -8,20 +8,20 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>287</width>
-            <height>102</height>
+            <width>295</width>
+            <height>104</height>
         </rect>
     </property>
     <property name="caption">
         <string>Keramik</string>
     </property>
     <vbox>
-        <property name="margin">
-            <cstring>0</cstring>
-        </property>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
+        <property name="margin">
+            <number>0</number>
+        </property>
         <widget class="TQCheckBox">
             <property name="name">
                 <cstring>showAppIcons</cstring>
-- 
cgit v1.2.1