diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-03-26 20:37:20 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-03-26 20:37:20 +0000 |
| commit | da5ce65b6bd031f66c32a0ee5124818af5c626da (patch) | |
| tree | 77564fe99cf0b412fc51a8bf1167f388bdef0f7b | |
| parent | eaf9d73babaf4dc7d13dd271d958e802d4029805 (diff) | |
| download | tdebase-da5ce65b6bd031f66c32a0ee5124818af5c626da.tar.gz tdebase-da5ce65b6bd031f66c32a0ee5124818af5c626da.zip | |
Fix keramic config uic-tqt segfault
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1226116 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kwin/clients/keramik/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kwin/clients/keramik/config/keramikconfig.ui | 12 |
2 files changed, 7 insertions, 9 deletions
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> |