84a0589 · unity8 · git.iko.soy

git.iko.soy/unity8

unity8-dash also needs a TouchRegistry

as it uses DirectionDragArea as well

commit84a05890b226a02ac3aa5d9bba0a0a68fee7957b authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateThu 2 Oct 2014, 12:36 (12 years ago) parentd78e2d1

2 files changed+8

compare with xenial

unifiedsplit

src/Dash/CMakeLists.txt+2 src/Dash/main.cpp+6

src/Dash/CMakeLists.txt+2

@@ -12,6 +12,8 @@ qt5_use_modules(unity8-dash Gui Qml Quick Test)

1212# For it to find libUbuntuGestures.so, needed by Ubuntu.Gestures QML module.

1313set_target_properties(unity8-dash PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")

1414

15+target_link_libraries(unity8-dash UbuntuGestures)

16+

1517# install binaries

1618install(TARGETS ${DASH_APP}

1719 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

src/Dash/main.cpp+6

@@ -31,6 +31,9 @@

3131#include "../ApplicationArguments.h"

3232#include "../CachingNetworkManagerFactory.h"

3333

34+// Ubuntu Gestures

35+#include <TouchRegistry.h>

36+

3437int main(int argc, const char *argv[])

3538{

3639 QGuiApplication *application = new QGuiApplication(argc, (char**)argv);

@@ -88,6 +91,9 @@ int main(int argc, const char *argv[])

8891 view->setTitle("Scopes");

8992 view->rootContext()->setContextProperty("applicationArguments", &qmlArgs);

9093

94+ TouchRegistry touchRegistry;

95+ view->installEventFilter(&touchRegistry);

96+

9197 // You will need this if you want to interact with touch-only components using a mouse

9298 // Needed only when manually testing on a desktop.

9399 MouseTouchAdaptor *mouseTouchAdaptor = 0;