Stop quick tile combine timer when activating a window

The quick tile test waits 1s to ensure that the quick tile combine timer
is not active. On the other hand, if the active window changes, it makes
sense to reset quick tile combine status. That also lets us get rid of
the QTest::qWait() in QuickTilingTest::testShortcut().

autotests/integration/quick_tiling_test.cpp

@@ -712,10 +712,6 @@ void QuickTilingTest::testShortcut()
 
     const int numberOfQuickTileActions = shortcutList.count();
 
-    if (numberOfQuickTileActions > 1) {
-        QTest::qWait(1001);
-    }
-
     for (QString shortcut : shortcutList) {
         // invoke global shortcut through dbus
         auto msg = QDBusMessage::createMethodCall(

src/activation.cpp

@@ -333,6 +333,8 @@ void Workspace::activateWindow(Window *window, bool force)
         // updateUserTime is X11 specific
         x11Window->updateUserTime();
     }
+
+    m_quickTileCombineTimer->stop();
 }
 
 /**