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

src/desktop/UBDesktopAnnotationController.cpp

@@ -176,8 +176,11 @@ void UBDesktopAnnotationController::showKeyboard(bool show)
         if(show)
             UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector);
         mKeyboardPalette->setVisible(show);
+
+        #ifdef Q_WS_X11
             updateMask(true);
-        //    mDesktopPalette->showVirtualKeyboard(show);
+        #endif
+        
     }
 
 }