← Back to branch summary

~dandrader/qtmir/frozenApps-lp1295623

« back to all changes in this revision

Viewing changes to tests/modules/common/common.pri

  • Committer: CI bot
  • Author(s): Daniel d'Andrada
  • Date: 2014-09-07 19:42:14 UTC
  • mfrom: (239.1.6 missingTouchEnd-lp1295623)
  • Revision ID: ps-jenkins@lists.canonical.com-20140907194214-1eq13l827gavf65i
QtEventFeeder: validate touches before sending them to Qt

Make sure we send a tidy touch event stream to Qt as some of it
(QQuickWindow) is vulnerable to things like missing touch releases.

Also properly ignore unsupported motion event actions such as hovering.
 Fixes: 1295623
Approved by: Gerry Boland, PS Jenkins bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/modules/common/common.pri
1
 
CONFIG += link_pkgconfig no_keywords # keywords clash with ProcessC++
2
 
PKGCONFIG += mirserver process-cpp ubuntu-app-launch-2
 
1
CONFIG += no_keywords # keywords clash with ProcessC++
 
2
PKGCONFIG += process-cpp ubuntu-app-launch-2
3
3
 
4
 
QT += quick testlib
5
 
QMAKE_CXXFLAGS = -std=c++11
 
4
QT += quick
6
5
 
7
6
HEADERS += ../common/mock_application_controller.h \
8
7
    ../common/mock_desktop_file_reader.h \
22
21
INCLUDEPATH += ../../../src/modules \
23
22
    ../common
24
23
 
25
 
 
26
 
GMOCK_SOURCES = /usr/src/gmock/src/gmock-all.cc \
27
 
                /usr/src/gmock/src/gmock_main.cc \
28
 
                /usr/src/gtest/src/gtest-all.cc
29
 
 
30
 
QMAKE_EXTRA_COMPILERS += gmock_compiler
31
 
gmock_compiler.input = GMOCK_SOURCES
32
 
gmock_compiler.output = $${OUT_PWD}/${QMAKE_FILE_BASE}.o
33
 
gmock_compiler.commands = g++ \
34
 
                          -I/usr/src/gtest \
35
 
                          -I/usr/src/gmock \
36
 
                          -c ${QMAKE_FILE_IN} \
37
 
                          -o ${QMAKE_FILE_OUT}
38
 
gmock_compiler.CONFIG = no_link
39
 
 
40
 
QMAKE_EXTRA_COMPILERS += gmock_linker
41
 
gmock_linker.depends = $${OUT_PWD}/gmock-all.o \
42
 
                       $${OUT_PWD}/gmock_main.o \
43
 
                       $${OUT_PWD}/gtest-all.o
44
 
gmock_linker.input = GMOCK_SOURCES
45
 
gmock_linker.output = $${OUT_PWD}/libgmock.a
46
 
gmock_linker.commands = ar -rv ${QMAKE_FILE_OUT} $${OUT_PWD}/gmock-all.o $${OUT_PWD}/gmock_main.o $${OUT_PWD}/gtest-all.o
47
 
gmock_linker.CONFIG = combine explicit_dependencies no_link target_predeps
48
 
 
49
 
LIBS += $${OUT_PWD}/libgmock.a \
 
24
LIBS += \
50
25
    -Wl,-rpath,$${OUT_PWD}/../../../src/modules/Unity/Application \
51
26
    -L$${OUT_PWD}/../../../src/modules/Unity/Application -lunityapplicationplugin \
52
27
    -Wl,-rpath,$${OUT_PWD}/../../../src/platforms/mirserver \