diff -r 6aeb7a756187 -r 3c88a81ff781 qstmgesturelib/qstmgesturelib.pro --- a/qstmgesturelib/qstmgesturelib.pro Thu Sep 23 15:32:11 2010 -0400 +++ b/qstmgesturelib/qstmgesturelib.pro Fri Oct 15 17:30:59 2010 -0400 @@ -24,7 +24,7 @@ INCLUDEPATH += qstmfilelogger INCLUDEPATH += recognisers -ROOT_DIR = $$PWD/../.. +ROOT_DIR = $$PWD/.. include($$ROOT_DIR/browserui.pri) QT += core @@ -36,6 +36,7 @@ recognisers/qstmupdowngesturerecogniser.h \ recognisers/qstmunknowngesturerecogniser.h \ recognisers/qstmtapgesturerecogniser.h \ + recognisers/qstmmaybetapgesturerecogniser.h \ recognisers/qstmreleasegesturerecogniser.h \ recognisers/qstmpinchgesturerecogniser.h \ recognisers/qstmpangesturerecogniser.h \ @@ -59,14 +60,16 @@ qstmtimerinterface.h \ qstmstateengineconfig.h \ qstmstateengine.h \ - qstmfilelogger/qstmfilelogger.h - + qstmfilelogger/qstmfilelogger.h \ + uitimer.h + SOURCES += recognisers/qstmtouchgesturerecogniser.cpp \ qstmgestureapi.cpp \ recognisers/qstmzoomgesturerecogniser.cpp \ recognisers/qstmupdowngesturerecogniser.cpp \ recognisers/qstmunknowngesturerecogniser.cpp \ recognisers/qstmtapgesturerecogniser.cpp \ + recognisers/qstmmaybetapgesturerecogniser.cpp \ recognisers/qstmreleasegesturerecogniser.cpp \ recognisers/qstmpinchgesturerecogniser.cpp \ recognisers/qstmpangesturerecogniser.cpp \ @@ -95,55 +98,20 @@ CONFIG += dll -#isEmpty(BEDROCK_OUTPUT_DIR): { -# CONFIG(release, debug|release):BEDROCKSETTINGSLIB_OUTPUT_DIR=$$PWD/../../../../WrtBuild/Release -# CONFIG(debug, debug|release):BEDROCKSETTINGSLIB_OUTPUT_DIR=$$PWD/../../../../WrtBuild/Debug -#} else { -# BEDROCKSETTINGSLIB_OUTPUT_DIR = $$BEDROCK_OUTPUT_DIR -#} - -GESTLIB_OUTPUT_DIR = $$ROOT_DIR/app/browser/qstmgesturelib/output -OBJECTS_DIR = $$GESTLIB_OUTPUT_DIR/qstmgesturelib/tmp -DESTDIR = $$GESTLIB_OUTPUT_DIR/bin -MOC_DIR = $$GESTLIB_OUTPUT_DIR/qstmgesturelib/tmp -RCC_DIR = $$GESTLIB_OUTPUT_DIR/qstmgesturelib/tmp -TEMPDIR = $$GESTLIB_OUTPUT_DIR/qstmgesturelib/build - - - - symbian: { -#INCLUDEPATH += /epoc32/include/oem/tgfw -#EXPORT_DIR += /epoc32/include/oem/tgfw -#EXPORT_FILES += qstmgestureapi.h \ -# qstmgesturelistener_if.h \ -# qstmgestureengine_if.h \ -# qstmgesture_if.h \ -# qstmutils.h \ -# qstmuievent_if.h \ -# qstmgesturedefs.h \ -# qstmgestureevent.h \ -# qstmfilelogger/qstmfilelogger.h - - - -# for(exp_file, EXPORT_FILES) { -# BLD_INF_RULES.prj_exports += "$${exp_file} $${EXPORT_DIR}/$$basename(exp_file)" -# } - #FIXME: These capabilities are way overkill TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = All -TCB -DRM -AllFiles + TARGET.CAPABILITY = All -TCB -DRM # NOTE: This is an not an OFFICIAL UID3 TARGET.UID3 = 0x200267D7 TARGET.VID = VID_DEFAULT - LIBS += -lcone + LIBS += -lcone -lws32 - qstmgesturelib.sources = qstmgesturelib.dll - qstmgesturelib.path = /sys/bin - DEPLOYMENT += qstmgesturelib + DEFINES += ADVANCED_POINTER_EVENTS + } + symbian:MMP_RULES += SMPSAFE