Merge branch 'master' of github.com:Sankore/Sankore-3.1

0788785b · Anatoly Mihalchenko · 569e4dd1 · d1d7ba74 · 0788785b
Commit 0788785b authored Aug 23, 2012 by Anatoly Mihalchenko
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

UBDesktopPalette.cpp src/desktop/UBDesktopPalette.cpp +0 -2

No files found.
--- a/src/desktop/UBDesktopPalette.cpp
+++ b/src/desktop/UBDesktopPalette.cpp
@@ -57,9 +57,7 @@ UBDesktopPalette::UBDesktopPalette(QWidget *parent)
    mShowHideAction->setCheckable(true);
    connect(mShowHideAction, SIGNAL(triggered(bool)), this, SLOT(showHideClick(bool)));
-#ifndef Q_WS_X11
    actions << mShowHideAction;
-#endif
    setActions(actions);
    setButtonIconSize(QSize(42, 42));