Commit Graph

42 Commits

Author SHA1 Message Date
Alex Blasche eb525425ba Remove WinCE vestiges
It is history since Qt 5.8/dev against which qtfeedback
is supposed to work.

Change-Id: I4018f1737447bbd76e3245273858be73fd4e7fcc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-04-12 06:04:52 +00:00
Oswald Buddenhagen de26e10992 purge symbian vestiges
Change-Id: I34c07f4750e1053c37dc725343629bc3d0486013
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
2016-04-12 06:04:49 +00:00
Alex Blasche 596bf45358 Update QtFeedback license/copyright headers
Change-Id: I846dfcc339a23f0b9f998a2b2f220eb48b0cf6f2
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-04-11 13:29:36 +00:00
Oswald Buddenhagen fec8a0c66f make use of qtHaveModule()
Change-Id: I6f2912926d736a30fa4eb3a03e9f9958b3f8c454
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-01-10 18:42:24 +01:00
Oswald Buddenhagen ac2dc5c022 remove some unnecessary CONFIG additions
qt is already added by spec_pre.prf, warn_on and depend_includepath by
default_pre.prf.

Change-Id: I244abbd633b901585c71600961d88b7834b6aca8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-12-16 21:59:50 +01:00
Oswald Buddenhagen c9e2d01358 remove symbian vestiges
Change-Id: I2841caece488ac2df959a26a47d245756b4d06a5
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2012-12-04 12:40:34 +01:00
Oswald Buddenhagen d22ba2dd01 adjust to qt_plugin.prf changes
DESTDIR and INSTALLS+=target are set up automatically now, but
PLUGIN_TYPE needs to be defined.

Change-Id: I903c61ad18160412bf2a39fca2fda72d7d02f461
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-11-01 22:37:07 +01:00
Oswald Buddenhagen e05a1b3750 remove pointless INCLUDEPATH additions
QT+=feedback already does that.

Change-Id: Iaffb2aa87013601c4348f0696ea76b14c9c1ce16
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-11-01 22:37:01 +01:00
Iikka Eklund f1172bda9a Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia

Change-Id: I9c4a751fa94b68cee30105a7f7eeaf7fd7e1abf4
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
2012-09-24 10:55:03 +02:00
Oswald Buddenhagen dcddd149fa centralize load(qt_build_config)s in .qmake.conf
Change-Id: I8c8cb18405637019d0ed566b5cdf83d3040e75b3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-09-13 19:03:27 +02:00
Kurt Korbatits ec381a6cdb Added check for audio support to qfeedbackmmk test
QTBUG-25448
- skip test if QFeedbackFileEffect::supportedMimeTypes() returns empty list.

Change-Id: Ie33eb2f45cb3b91bd06ce340592a946bd53de09f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-08-03 00:56:11 +02:00
Thiago Macieira eba8364129 Set the Qt API level to compatibility mode in all tests.
Qt 5.0 beta requires changing the default to the 5.0 API, disabling
the deprecated code. However, tests should test (and often do) the
compatibility API too, so turn it back on.

Task-number: QTBUG-25053
Change-Id: I89868a1a30876c2dfdf2950fc816736e6d04721e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-01 22:27:27 +02:00
Toby Tomkins 1803ec3f5d Mark test as expected fail on mac platforms, and insignificant on win32.
Logic has been included to produce an expected failure on the mac
platform. The insignificant_test flag has been added to the .pro file
for the win32 platform as it is unstable.

Task-number: QTBUG-25448

Change-Id: Ieaf6cead9b026659d533c86af32385da1984e2eb
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-30 05:53:45 +02:00
Stephen Kelly dde6b3a9ad Test that the package configs for QtFeedback work.
Change-Id: Id1e7a66c8beaf50c6e1ba78c83f922ead0a54244
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-20 07:27:39 +02:00
Oswald Buddenhagen f4439886f1 build system cleanups
- load(qt_module) => load(qt_build_config)
- remove:
  - CONFIG+=module (obsolete)
  - code relating to module version headers (automated now)
  - %mastercontent assignment (automated now)
  - QT_BUILD_*_LIB defines (automated now)
  - pointless QPRO_PWD assignments
  - pointless DEFINES+=QT_MAKEDLL

Change-Id: Ide1099c5e742e7c9a17d2775645381cb0c6b321f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-26 14:56:04 +02:00
Toby Tomkins b6beef13c5 Fixed whitespace.
Change-Id: I4fc18eaf147f1bc65bc04608ebd5ef1843e1138d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-06-08 02:23:38 +02:00
Toby Tomkins 44a568096f Fix plugin compilation errors related to qtbase plugin changes.
The qtfeedback plugin changes had been performed in checkin
9610e64f3e . However this modification
did not take into consideration other test code. This changes moves
testplugin implementation to the newer style.

Change-Id: I5ec6f5cd52369d6a49ad28700fd5a4786a5fd765
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-06-06 07:27:31 +02:00
Mrudul Pendharkar a63a84db16 Cleaning code and removing dependency on QCoreApplication
Change-Id: Ie37bc765656ec420989460563cc0424813f2f7a9
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-05-31 13:45:30 +02:00
Toby Tomkins ddaa4d9aef remove dependency on qtscript from autotest.
qtfeedback is not build with qtscript as a dependency; update autotest
.pro file accordingly.

Change-Id: Id4546e18f24bca2027ee47f80451c713530f0e5c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-05-17 07:51:16 +02:00
Kent Hansen dc9abdbab6 Don't use QtDeclarative compat module
Use QtQml instead.

Change-Id: Iced52d09931713f0db8eaaa041068b4aedc1c9c3
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2012-05-14 08:06:58 +02:00
Jason McDonald 7c6ae30394 Remove insignificant_test marker for maemo platform.
Continuous Integration is no longer performed for this platform.

Change-Id: I1e4d710d77e4e922647823eda0fae3f15037e205
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-04-25 18:31:33 +02:00
Jason McDonald 23a3ea937d Make qtfeedbackmmk test insignificant on Windows and not on Ubuntu 10.04
The test passes on Ubuntu 10.04, but fails on some Ubuntu 11.10 builds.
The test also fails on Windows, but CI is not presently enforcing tests
on Windows for this module.

Task-number: QTBUG-25448
Change-Id: I3486c114c02ea8bfc3bcc90e144a1cd6944efe68
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-04-25 18:31:29 +02:00
Friedemann Kleint 1cbbcc6608 Fix compilation after qtbase:8f85b84f4eaa85ff5c02ec5e65fd6706a10690b9.
- Remove QDeclarative compatibility module code.
- Remove remains of Symbian.

Change-Id: Ib24c0c027c899e7eb30b3c8550a483d0d8b2b77f
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2012-04-25 09:54:23 +02:00
Jaakko Korpela f5e5ecfafd Emit stateChanged signal in QDeclarativeFeedbackEffect.
Emit stateChanged signal and update autotest accordingly.

Change-Id: Ib937a817d1994072a56ddb27033855bdbea212c2
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-04-11 10:00:12 +02:00
Jaakko Korpela e4f9829907 Fix compare logic in setting HapticsEffect intensities.
New intensity value is set if the compared values differ,
not when they are the same. Update the autotest as well
with HapticEffect value update tests.

Change-Id: Ic24ef4307f4e4f17f38c4a45ed348e43aece4735
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2012-03-15 09:13:38 +01:00
Jaakko Korpela 7d7daa204a Change declarative import path.
Modules need to be stored directly under imports/.

Change-Id: If0bcbc92e40e6894de6aa2a94f077fe445e74a3f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
2012-01-30 22:14:35 +01:00
Jason McDonald 55420a8900 Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.

Change-Id: I31a62a888eb75c9a64bf2ce47fc39fc8f5112ece
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-30 07:08:37 +01:00
Jason McDonald 0386316f74 Update obsolete contact address.
Replace Nokia contact email address with Qt Project website.

Change-Id: Idf3334eaea385d4c6fc17ee7968ecf64d4894e35
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-23 02:55:12 +01:00
Jason McDonald 49ca34ddbb Update copyright year in Nokia copyright headers.
Update copyright headers from before 2011.

Change-Id: I1b38c7ec02928076063246f6f092b668e982e3a5
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-11 05:11:27 +01:00
Rohan McGovern 3b9f1ebccd Fixed compile on Windows in release mode.
It is not valid to unconditionally enable debug mode on platforms where
debug/release affects linkage.  On these platforms, debug mode can only
be used if the debug libraries are enabled, and release mode can only be
used if the release libraries are enabled.

Let the build system set the correct mode.

Change-Id: I1a4869a47b158049de2e8c71a62c3df059a70281
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-01-11 04:05:21 +01:00
Jaakko Korpela f235033e8d Update theme effect enumeration.
Change-Id: I2021294d082f3d3486b4ae1165dcf9fd1c8c9e49
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2011-12-19 17:16:44 +01:00
Jason McDonald 24980f398d Remove unused QTRY_WAIT macros.
Change-Id: Ia1ca366b3f7b329b7aed76c427b62cc15ad9355e
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-12-09 06:43:43 +01:00
Jason McDonald f23c247fde Remove duplicate definitions of QTRY_COMPARE and QTRY_VERIFY.
These macros are now provided by QTestLib via the QtTest/QtTest header.

Change-Id: I60e571e9772170f6576465e19f8ac610313b537a
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-12-09 06:43:39 +01:00
Friedemann Kleint 00c4f75af2 QtFeedback: Remove rpath from test profiles.
It should use QMAKE_LFLAGS_RPATH, but since $$QT.feedback.libs
evaluates to qtbase/libs, there is no need to specify it.

Change-Id: I945ccb10537aaa36fb7ff2dd2591185d4e5df50e
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
Sanity-Review: Jaakko Korpela <jaakko.korpela@nokia.com>
2011-11-30 10:16:39 +01:00
Rohan McGovern ae67744002 tst_qfeedbackmmk: acknowledge crashing test.
b4d23e61ed19c770caf6b993a8ab0e4474d3f417 in qtbase changes QTest::qWait
to also handle DeferredDelete events.  This has triggered a crash in
this test.  Mark the test as insignificant until the problem is handled,
to unblock integrations.

Task-number: QTBUG-22779
Change-Id: I85e5553920774a9855bf831306d0d9a59aa20c35
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2011-11-17 05:24:56 +01:00
Jason McDonald 4af42257b6 Remove SkipMode parameter from QSKIP.
The SkipMode parameter has been removed from the API in qtbase, so it
must be in all calls to QSKIP.

Task-number: QTBUG-21851, QTBUG-21652
Change-Id: Ib2a86f1bf7ce46a469d4b550ff2f3cef2643e20b
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-11-09 01:55:27 +01:00
Rohan McGovern b6bd1a7844 Fix and enable tests.
Autotests are compiling, and all but one passing, so enable them.

Update qdeclarativefeedback testdata for Qt 5.

QEXPECT_FAIL qfeedbackmmk test until fixed.

Task-number: QTBUG-22020
Change-Id: I0aa2977029feb66020ff7d4c70738605df15b87c
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2011-10-25 07:19:00 +02:00
Jaakko Korpela 433c5389eb Disable feedback plugin unittest
Change-Id: I2616aaa746c9e211a2cda79e6de606bde7b66ce2
Reviewed-on: http://codereview.qt-project.org/5914
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
2011-10-03 10:52:22 +02:00
Jaakko Korpela d899bfaa70 Enable feedback plugin and multimedia kit tests
These tests do not require xcb plugin can can be run on OBS

Change-Id: I6baeac672b1aada0e4f6c75a3c02f43116db3de5
Reviewed-on: http://codereview.qt-project.org/5806
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
2011-09-30 09:57:19 +02:00
Xizhi Zhu 53c6bac948 Fix the names for plugins.
Change-Id: Ic6e34681695def6fe4e117f95261c27e10b29c60
Reviewed-on: http://codereview.qt-project.org/5832
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
2011-09-30 08:49:59 +02:00
Rohan McGovern 97b4075eaf Removed obsolete QTM_NAMESPACE references, fixed compile of tests.
Change-Id: I21241782e7d6abd3203a6f4fb978d28c22aa2f2c
Reviewed-on: http://codereview.qt-project.org/5412
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2011-09-23 01:27:42 +02:00
Xizhi Zhu d8fb85f967 Initial commit of modularized QtFeedback.
TODO:
1) Remove qmobilitypluginsearch.h
2) Fix auto tests.
2011-07-01 11:09:43 +03:00