diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-05 18:42:34 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-05 18:42:34 +0000 |
| commit | 4ed6c841d7ef66c27280603f3793ee1607a38713 (patch) | |
| tree | ee55fc78a226c3723d8d0e832e694b29ab42393a | |
| parent | fc1ca4e6f8885ff685b21ff189a357de97c97de6 (diff) | |
| download | tdebase-4ed6c841.tar.gz tdebase-4ed6c841.zip | |
Fix kdebase parallel build failure
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1245177 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kicker/applets/launcher/quickbutton.cpp | 8 | ||||
| -rw-r--r-- | kicker/applets/systemtray/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 088e4a573..58f60715d 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -259,9 +259,11 @@ void QuickButton::slotIconChanged(int group) void QuickButton::launch() { - setDown(false); - update(); - KIconEffect::visualActivate(this, rect()); + if (!KickerSettings::showDeepButtons()) { + setDown(false); + update(); + KIconEffect::visualActivate(this, rect()); + } if (_qurl->kurl().url() == "SPECIAL_BUTTON__SHOW_DESKTOP") { if (isOn()) { ShowDesktop::the()->showDesktop(TRUE); diff --git a/kicker/applets/systemtray/CMakeLists.txt b/kicker/applets/systemtray/CMakeLists.txt index 76151db69..ee1ea0436 100644 --- a/kicker/applets/systemtray/CMakeLists.txt +++ b/kicker/applets/systemtray/CMakeLists.txt @@ -42,5 +42,5 @@ tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK kickermain-shared clock_panelapplet-static DESTINATION ${PLUGIN_INSTALL_DIR} - DEPENDENCIES kicker_core-static kicker-static kicker-shared clock_panelapplet-shared + DEPENDENCIES kicker_core-static kicker-static kicker-shared clock_panelapplet-static ) |