qt:qtfeedback.git
5 years agoChange copyrights from Nokia to Digia
Iikka Eklund [Thu, 20 Sep 2012 11:41:21 +0000 (14:41 +0300)]
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>
5 years agocentralize load(qt_build_config)s in .qmake.conf
Oswald Buddenhagen [Mon, 3 Sep 2012 10:07:56 +0000 (12:07 +0200)]
centralize load(qt_build_config)s in .qmake.conf

Change-Id: I8c8cb18405637019d0ed566b5cdf83d3040e75b3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
5 years agoUpdate the git-archive export options
Thiago Macieira [Wed, 29 Aug 2012 19:40:03 +0000 (21:40 +0200)]
Update the git-archive export options

The .gitattributes and .gitignore files do not need to be present in
packaged sources, as they are for people using the Git repository.
People who download tarballs usually don't reimport into Git -- they
should just download the actual repositories.

Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the $n string, ask git-archive to store
the SHA-1 of the commit being packaged.

Change-Id: Ie706262d09be3274da37c085a5adbeac7b3df7ac
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoUse QMAKE_DOCS v5.0.0-beta1
J-P Nurmi [Tue, 21 Aug 2012 15:18:19 +0000 (17:18 +0200)]
Use QMAKE_DOCS

Change-Id: I8f30072277864a6d9a42ffcd484d15c01a125f60
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
5 years agofollow rename of qt_module_config.prf to qt_module.prf
Oswald Buddenhagen [Tue, 7 Aug 2012 17:09:40 +0000 (19:09 +0200)]
follow rename of qt_module_config.prf to qt_module.prf

Change-Id: I478782cab056dc411996bfb884895c6942051a58
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
5 years agoUpdate import api to follow changes in qtdeclarative.
Toby Tomkins [Fri, 10 Aug 2012 03:44:29 +0000 (13:44 +1000)]
Update import api to follow changes in qtdeclarative.

Changes in 4a8a8953f70197a7ab7a62fcd01b1bc08051689e made to
qtdeclarative require changes to the import api. Follow these changes.

Change-Id: I1c333f915470c5abd792c88704fc3e23a280b05f
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
5 years agoDoc: Changed HTML filename of the main page.
Jerome Pasion [Fri, 3 Aug 2012 10:09:32 +0000 (12:09 +0200)]
Doc: Changed HTML filename of the main page.

-index.html collides with the Qt 5 documentation
-renamed qdoc file.

Change-Id: I83d3a1fc2411dc07932c7973dcb5cf3049e6b8c2
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
5 years agoAdded check for audio support to qfeedbackmmk test
Kurt Korbatits [Tue, 31 Jul 2012 01:14:09 +0000 (11:14 +1000)]
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>
5 years agoSet the Qt API level to compatibility mode in all tests.
Thiago Macieira [Wed, 1 Aug 2012 13:48:15 +0000 (15:48 +0200)]
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>
5 years agoDoc: Changed \qmlclass to \qmltype and added \instantiates
Jerome Pasion [Fri, 27 Jul 2012 17:01:30 +0000 (19:01 +0200)]
Doc: Changed \qmlclass to \qmltype and added \instantiates

-\qmlclass is now \qmltype
-\instantiates is for QML types implemented in C++

Change-Id: Ia23873a5e1c9098054f3820355b826611ef19dab
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Harri Heine <harri.heine@nokia.com>
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoMark test as expected fail on mac platforms, and insignificant on win32.
Toby Tomkins [Fri, 27 Jul 2012 05:57:56 +0000 (15:57 +1000)]
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>
5 years agoAdd the CMake directory created during unit testing to .gitignore.
Stephen Kelly [Mon, 23 Jul 2012 07:52:21 +0000 (09:52 +0200)]
Add the CMake directory created during unit testing to .gitignore.

Change-Id: I27ffdc4deb691287661d0be3702f11502d192097
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
5 years agoTest that the package configs for QtFeedback work.
Stephen Kelly [Thu, 19 Jul 2012 14:03:29 +0000 (16:03 +0200)]
Test that the package configs for QtFeedback work.

Change-Id: Id1e7a66c8beaf50c6e1ba78c83f922ead0a54244
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoDocumentation: Changed the title of index.qdoc page
Harri Heine [Wed, 15 Feb 2012 09:06:15 +0000 (11:06 +0200)]
Documentation: Changed the title of index.qdoc  page

Change-Id: I332d1943d3486e7df081c379aa0c065d9729e623
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agouse centralized qml plugin project handling
Oswald Buddenhagen [Mon, 9 Jul 2012 16:52:46 +0000 (18:52 +0200)]
use centralized qml plugin project handling

Change-Id: Ic76330ac0ed10216412649b9abc7de73a730e2f0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agouse centralized handling of QT_BUILD_PARTS
Oswald Buddenhagen [Tue, 3 Jul 2012 19:37:30 +0000 (21:37 +0200)]
use centralized handling of QT_BUILD_PARTS

Change-Id: Id4e0244015c828d855e4f3485cf18ef77e48e3d6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoUpdate the export macros in qtfeedback.git
Thiago Macieira [Fri, 22 Jun 2012 09:02:29 +0000 (11:02 +0200)]
Update the export macros in qtfeedback.git

Use the new, simpler QT_STATIC macro.

Change-Id: Idb0791760ccdbd0ba692d00b033209a4cbab365f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agobuild system cleanups
Oswald Buddenhagen [Thu, 12 Apr 2012 10:12:03 +0000 (12:12 +0200)]
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>
5 years agoauto-generate module pris
Oswald Buddenhagen [Thu, 12 Apr 2012 08:49:30 +0000 (10:49 +0200)]
auto-generate module pris

Change-Id: I008b9ade01b3f043d8e0cdc6653104a4e9d578b2
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
5 years agoFixed whitespace.
Toby Tomkins [Wed, 6 Jun 2012 05:16:11 +0000 (15:16 +1000)]
Fixed whitespace.

Change-Id: I4fc18eaf147f1bc65bc04608ebd5ef1843e1138d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoFix plugin compilation errors related to qtbase plugin changes.
Toby Tomkins [Wed, 6 Jun 2012 05:08:36 +0000 (15:08 +1000)]
Fix plugin compilation errors related to qtbase plugin changes.

The qtfeedback plugin changes had been performed in checkin
9610e64f3efe591621548e90e64d0e21cbfaea98 . 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>
5 years agoConvert the plugins to the new plugin format
Lars Knoll [Sun, 27 May 2012 09:51:55 +0000 (11:51 +0200)]
Convert the plugins to the new plugin format

Added the implemented interfaces to the metadata. This should
allow further changes where we don't need to load the plugin to
find out about it's implemented interfaces.

Change-Id: I6691719749f85e73d39d01bf99f06a5cadeebab4
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
5 years agoRemove the symbian plugin
Lars Knoll [Sun, 27 May 2012 09:43:12 +0000 (11:43 +0200)]
Remove the symbian plugin

Since Qt 5 doesn't support Symbian, there's no point
in keeping the plugin.

Change-Id: I34b428bbfb104ce04bbb55f53aa9d313f0aabfa1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
5 years agoCleaning code and removing dependency on QCoreApplication
Mrudul Pendharkar [Fri, 18 May 2012 13:13:51 +0000 (16:13 +0300)]
Cleaning code and removing dependency on QCoreApplication

Change-Id: Ie37bc765656ec420989460563cc0424813f2f7a9
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoExpose actuator state and capability properties in declarative.
Jaakko Korpela [Tue, 15 May 2012 11:52:23 +0000 (14:52 +0300)]
Expose actuator state and capability properties in declarative.

Change-Id: I4760ea51515b05333dfb266197beac06e1818b7d
Reviewed-by: Mrudul Pendharkar <mrudul.v.pendharkar@nokia.com>
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agosync.profile: remove dependency on qtsvg.
Toby Tomkins [Mon, 14 May 2012 05:09:42 +0000 (15:09 +1000)]
sync.profile: remove dependency on qtsvg.

sync.profile should not reference modules as dependencies unless they
are actually required; update sync.profile accordingly.

Change-Id: Ie8488112d8553376801c17ea62873061b4dac3ab
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoremove dependency on qtscript from autotest.
Toby Tomkins [Fri, 11 May 2012 05:34:33 +0000 (15:34 +1000)]
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>
5 years agoDon't use QtDeclarative compat module
Kent Hansen [Thu, 10 May 2012 14:33:17 +0000 (16:33 +0200)]
Don't use QtDeclarative compat module

Use QtQml instead.

Change-Id: Iced52d09931713f0db8eaaa041068b4aedc1c9c3
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
5 years agoDoc: Fix \sa usage
Marius Storm-Olsen [Thu, 10 May 2012 11:22:15 +0000 (13:22 +0200)]
Doc: Fix \sa usage

Ensure comma between elements (3 missing), single space and curly-
braces around title elements, etc.

Change-Id: I87278a3854c1074cbd53d38cce236aa0a9a2dc57
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
5 years agoDocumentation: Adding snippets for QML docs
Harri Heine [Thu, 3 May 2012 13:04:21 +0000 (16:04 +0300)]
Documentation: Adding snippets for QML docs

Change-Id: I54fb3ae0e9504cb9c6ed3f9704260e7cecb14a9e
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoRemove insignificant_test marker for maemo platform.
Jason McDonald [Mon, 23 Apr 2012 11:43:24 +0000 (21:43 +1000)]
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>
5 years agoMake qtfeedbackmmk test insignificant on Windows and not on Ubuntu 10.04
Jason McDonald [Mon, 23 Apr 2012 10:15:55 +0000 (20:15 +1000)]
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>
5 years agoChanging Fileeffects as internal
Harri Heine [Mon, 23 Apr 2012 06:23:09 +0000 (09:23 +0300)]
Changing Fileeffects as internal

Change-Id: If9b8c9941e6261ba73b989ba327147b4ab409dd6
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoFix compilation after qtbase:8f85b84f4eaa85ff5c02ec5e65fd6706a10690b9.
Friedemann Kleint [Wed, 25 Apr 2012 07:32:55 +0000 (09:32 +0200)]
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>
5 years agoAdd required QHash header to mmk plugin.
Toby Tomkins [Thu, 19 Apr 2012 04:59:41 +0000 (14:59 +1000)]
Add required QHash header to mmk plugin.

Change-Id: I05ae0be5a29b9d95fcb7cfa2a51b969b464adc10
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoEmit stateChanged signal in QDeclarativeFeedbackEffect.
Jaakko Korpela [Tue, 3 Apr 2012 09:42:05 +0000 (12:42 +0300)]
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>
5 years agoAdding plugins.qmltypes
Mrudul Pendharkar [Mon, 2 Apr 2012 13:34:00 +0000 (16:34 +0300)]
Adding plugins.qmltypes

Change-Id: Ib553938996e4c4389d0a3b20c52d509d987e7ff6
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoUse templated qmlRegisterModuleApi()
Pekka Vuorela [Thu, 29 Mar 2012 14:08:33 +0000 (17:08 +0300)]
Use templated qmlRegisterModuleApi()

Avoids warning when registering types.

Change-Id: I92d3f9d4f623297492f6d641ce3ef680f6ed122f
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoFix compilation for examples
Yuchen Deng [Mon, 2 Apr 2012 13:11:06 +0000 (21:11 +0800)]
Fix compilation for examples

Change-Id: I2f98e33bba47ed3166475410bf2efe226d669216
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoUse new plugin interface on QtQuick module
Pekka Vuorela [Thu, 29 Mar 2012 11:15:16 +0000 (14:15 +0300)]
Use new plugin interface on QtQuick module

Change-Id: I0e0cf8e504e85c2069447ae84f4bf1eb527a1a06
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoQtFeedback: Fix warnings about deprecated QtDeclarative headers.
Friedemann Kleint [Fri, 16 Mar 2012 11:26:52 +0000 (12:26 +0100)]
QtFeedback: Fix warnings about deprecated QtDeclarative headers.

Change-Id: I6260916387a92a69c31eaf7fdfd8d861e9a35514
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoFix compare logic in setting HapticsEffect intensities.
Jaakko Korpela [Wed, 14 Mar 2012 10:27:04 +0000 (12:27 +0200)]
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>
5 years agoDocumentation: Wording improvements.
Harri Heine [Thu, 8 Mar 2012 12:12:51 +0000 (14:12 +0200)]
Documentation: Wording improvements.

Change-Id: Ie36b73bab365018a40144330be70943c498fefa9
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoRemove pin of qtbase for qtfeedback.
Jyri Tahtela [Mon, 5 Mar 2012 09:38:44 +0000 (11:38 +0200)]
Remove pin of qtbase for qtfeedback.

Change-Id: I3a881a6293329937154c839808a05a264d0b0984
Reviewed-by: Mrudul Pendharkar <mrudul.v.pendharkar@nokia.com>
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoRemove the usage of deprecated qdoc macros.
Casper van Donderen [Thu, 1 Mar 2012 17:44:54 +0000 (18:44 +0100)]
Remove the usage of deprecated qdoc macros.

QDoc now has support for Doxygen style commands for italics, bold
and list items. This change applies that change in QDoc to the
actual documentation.

Task-number: QTBUG-24578
Change-Id: If4ef95f71dfe7213e04be6b71cb0505eab698e8e
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoRemoving deprecated declarative feedback import
Mrudul Pendharkar [Fri, 2 Mar 2012 11:38:43 +0000 (13:38 +0200)]
Removing deprecated declarative feedback import

Change-Id: Ia3017227dc66b281f7e3cb067458f6655a2aac46
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoclean up qmake-generated projects
Oswald Buddenhagen [Tue, 21 Feb 2012 16:31:40 +0000 (17:31 +0100)]
clean up qmake-generated projects

remove assignmets which are defaults or bogus

Change-Id: Ibf2236335fd971a12c5f956930ab8be940fa9a96
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
5 years agoDocumentation: \i tag changed to \e for italics.
Eero Hyyti [Fri, 17 Feb 2012 09:56:36 +0000 (11:56 +0200)]
Documentation: \i tag changed to \e for italics.

Change-Id: I14be2c19d34ce41941d0149cf9883f1e3ed37210
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoDocumentation: ifr file extensions changed to ivt.
Eero Hyyti [Fri, 17 Feb 2012 07:54:06 +0000 (09:54 +0200)]
Documentation: ifr file extensions changed to ivt.

Change-Id: I2c488927995387df6f11bb3f219091a9ec9acd00
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoDocumentation: Mobility term changed to Feedback in QFeedbackEffect.
Eero Hyyti [Thu, 16 Feb 2012 11:36:19 +0000 (13:36 +0200)]
Documentation: Mobility term changed to Feedback in QFeedbackEffect.

Change-Id: I29693e1767663b198ab4de69321f80d302e90754
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoModule Api for declarative ThemeEffect.
Mrudul Pendharkar [Wed, 8 Feb 2012 09:52:44 +0000 (11:52 +0200)]
Module Api for declarative ThemeEffect.

Change-Id: Id83d2364acb6ab40624de20e16ab8433409fd1e1
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoDocumentation: Improved QML feedback page
Harri Heine [Wed, 15 Feb 2012 08:58:34 +0000 (10:58 +0200)]
Documentation: Improved QML feedback page

Change-Id: Ib21e2f379462234270c92bfb942a4249da3e5217
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoRegister both declarative import paths in declarative plugin.
Jaakko Korpela [Tue, 14 Feb 2012 11:53:14 +0000 (13:53 +0200)]
Register both declarative import paths in declarative plugin.

Change-Id: Ida65e63352738926ce4a35e208ab4c394dbfac37
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
5 years agoChanged QML feedback plugin doc title
Harri Heine [Tue, 14 Feb 2012 14:11:12 +0000 (16:11 +0200)]
Changed QML feedback plugin doc title

Change-Id: I615861e1caba4fbf252b34b16d95053709cf2e58
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoRemoving mobility references from src/imports/feedback
Harri Heine [Mon, 13 Feb 2012 14:12:13 +0000 (16:12 +0200)]
Removing mobility references from src/imports/feedback

Change-Id: Id61e0be14f35c47db404bb13c7ff67152a235ec9
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoImproved Haptics ThemeEffect Example
Harri Heine [Thu, 9 Feb 2012 10:55:11 +0000 (12:55 +0200)]
Improved Haptics ThemeEffect Example

Change-Id: I6f46ca43a98fc2f6ae28d2a145f5dcbcef42c3b0
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoDocumentation: platform specific things removed from main page.
Harri Heine [Wed, 8 Feb 2012 07:34:44 +0000 (09:34 +0200)]
Documentation: platform specific things removed from main page.

Removed Symbian and Maemo references.

Change-Id: I471d99349c36a9022a4826a327899e19e2c61581
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoUpdate feedback effect enumerations.
Jaakko Korpela [Tue, 7 Feb 2012 13:33:08 +0000 (15:33 +0200)]
Update feedback effect enumerations.

PressAndHold and Popup really are the same thing. Merge
the two as Appear and replace PopupClose with Disappear.

Change-Id: I7cf0447b6dff535adde77056bd7f891f605a6203
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
5 years agoAdd support for old declarative import path.
Jaakko Korpela [Fri, 3 Feb 2012 13:32:35 +0000 (15:32 +0200)]
Add support for old declarative import path.

Support the old import path over a depracation period.

Change-Id: Idaebf53f810f6e857d72ce6313f10040083f7d46
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
5 years agoDocumentation: add missing pictures and snippets.
Jaakko Korpela [Wed, 1 Feb 2012 08:33:58 +0000 (10:33 +0200)]
Documentation: add missing pictures and snippets.

Change-Id: I5d950a2ebd96a2410e5bea3c98d00fc00843d67e
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
5 years agoChange declarative import path.
Jaakko Korpela [Mon, 30 Jan 2012 12:18:57 +0000 (14:18 +0200)]
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>
5 years agoRemove "All rights reserved" line from license headers.
Jason McDonald [Tue, 24 Jan 2012 05:46:50 +0000 (15:46 +1000)]
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>
5 years agoUpdate outdated license headers.
Jason McDonald [Mon, 23 Jan 2012 06:17:47 +0000 (16:17 +1000)]
Update outdated license headers.

Change-Id: Id22eacd0d59f2d263555dbe55e01a46f46d9387e
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoDocumentation: Image configuration folder changed.
Eero Hyyti [Mon, 23 Jan 2012 14:30:49 +0000 (16:30 +0200)]
Documentation: Image configuration folder changed.

Change-Id: I8b076950f8339afb935f6fa2d269a5a6669de750
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoUpdate obsolete contact address.
Jason McDonald [Fri, 20 Jan 2012 04:16:21 +0000 (14:16 +1000)]
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>
5 years agoAdd documentation.
Jaakko Korpela [Thu, 19 Jan 2012 10:14:33 +0000 (12:14 +0200)]
Add documentation.

Change-Id: If84a553d3d74792eee1ccd258b57e026a6100b96
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
5 years agoUpdate copyright year in Nokia copyright headers.
Jason McDonald [Tue, 10 Jan 2012 06:13:12 +0000 (16:13 +1000)]
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>
5 years agoFixed compile on Windows in release mode.
Rohan McGovern [Fri, 6 Jan 2012 01:36:54 +0000 (11:36 +1000)]
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>
5 years agosync.profile: introduce dependency on qtjsbackend
Rohan McGovern [Tue, 10 Jan 2012 08:04:38 +0000 (18:04 +1000)]
sync.profile: introduce dependency on qtjsbackend

sync.profile needs to enumerate indirect dependencies too.
qtdeclarative now depends on qtjsbackend; update sync.profile
accordingly.

Change-Id: Ia7ff69cb4c139939e9c6cb6541b1faad87105ec3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
5 years agoUpdate copyright year in license headers.
Jason McDonald [Thu, 5 Jan 2012 05:26:57 +0000 (15:26 +1000)]
Update copyright year in license headers.

Change-Id: I792cb838352df5403722fb8db0ce23909b8737f9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoUpdate theme effect enumeration.
Jaakko Korpela [Wed, 14 Dec 2011 12:42:54 +0000 (14:42 +0200)]
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>
5 years agoRemove unused QTRY_WAIT macros.
Jason McDonald [Tue, 6 Dec 2011 06:54:21 +0000 (16:54 +1000)]
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>
5 years agoRemove duplicate definitions of QTRY_COMPARE and QTRY_VERIFY.
Jason McDonald [Tue, 6 Dec 2011 05:37:58 +0000 (15:37 +1000)]
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>
5 years agoQtFeedback: Remove rpath from test profiles.
Friedemann Kleint [Tue, 29 Nov 2011 12:15:14 +0000 (13:15 +0100)]
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>

6 years agoDon't install tests by default.
Rohan McGovern [Wed, 16 Nov 2011 01:17:23 +0000 (11:17 +1000)]
Don't install tests by default.

Installing tests is a relatively rare use case, and is already
disabled by default for some qt5 modules.  Make the behavior
consistent and disable it by default here too.

Change-Id: Ie12124390247189a4f93d9eafabd643e651d34ef
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
6 years agotst_qfeedbackmmk: acknowledge crashing test.
Rohan McGovern [Thu, 17 Nov 2011 01:54:42 +0000 (11:54 +1000)]
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>
6 years agoRemove SkipMode parameter from QSKIP.
Jason McDonald [Wed, 19 Oct 2011 04:59:06 +0000 (14:59 +1000)]
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>
6 years agoUse the qtmultimedia module in sync.profile, not qtmultimediakit.
Michael Goddard [Wed, 26 Oct 2011 07:11:42 +0000 (17:11 +1000)]
Use the qtmultimedia module in sync.profile, not qtmultimediakit.

Change-Id: Ib3edf01e22b118bff1a8884c304ed9503d0a2a2d
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
6 years agoFix and enable tests.
Rohan McGovern [Fri, 14 Oct 2011 04:00:04 +0000 (14:00 +1000)]
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>
6 years agoQSoundEffect was made public - change to a public header include.
Michael Goddard [Tue, 18 Oct 2011 01:08:03 +0000 (11:08 +1000)]
QSoundEffect was made public - change to a public header include.

Change-Id: I0580659a2e9a29e635492544101da8778f5108e3
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
6 years agoUpdated feedback mmk plugin for qtmultimediakit -> qtmultimedia
Rohan McGovern [Fri, 14 Oct 2011 03:29:55 +0000 (13:29 +1000)]
Updated feedback mmk plugin for qtmultimediakit -> qtmultimedia

qtmultimediakit is no more.  Use qtmultimedia.

Change-Id: I838adb2a4e0ef60e75a5c429345a7b83ed5ef1b4
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
6 years agoFixed failure of tst_QFeedbackNoPlugins
Rohan McGovern [Fri, 14 Oct 2011 03:23:24 +0000 (13:23 +1000)]
Fixed failure of tst_QFeedbackNoPlugins

Nothing ever defines QT_BUILD_UNITTESTS.
Just enable the testing hook unconditionally, it's harmless.

Task-number: QTBUG-22018
Change-Id: Iba2f775b33397e5efb0f91d9e22f04c0c0ca3a60
Reviewed-on: http://codereview.qt-project.org/6647
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
6 years agoMake use of a public qfeedbackglobal header file.
Jaakko Korpela [Thu, 13 Oct 2011 06:48:22 +0000 (09:48 +0300)]
Make use of a public qfeedbackglobal header file.

Exported classes QFeedbackActuator and QFeedbackEffect included a private header file.

Change-Id: I27fb4e64ad46053381c17419f958d1e2ca55fe42
Reviewed-on: http://codereview.qt-project.org/6568
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
6 years agoQtFeedback: Compile on Windows.
Friedemann Kleint [Thu, 6 Oct 2011 12:03:34 +0000 (14:03 +0200)]
QtFeedback: Compile on Windows.

Change-Id: If04f85375e35e75faba7d3766baac65a2017c228
Reviewed-on: http://codereview.qt-project.org/6154
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
6 years agoDisable feedback plugin unittest
Jaakko Korpela [Fri, 30 Sep 2011 13:06:43 +0000 (16:06 +0300)]
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>
6 years agoEnable feedback plugin and multimedia kit tests
Jaakko Korpela [Thu, 29 Sep 2011 13:39:35 +0000 (16:39 +0300)]
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>
6 years agoFix the names for plugins.
Xizhi Zhu [Fri, 30 Sep 2011 06:48:52 +0000 (09:48 +0300)]
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>
6 years agoRemoved obsolete QTM_NAMESPACE references, fixed compile of tests.
Rohan McGovern [Thu, 22 Sep 2011 23:21:01 +0000 (09:21 +1000)]
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>
6 years agoEnable the mmk plugin.
Xizhi Zhu [Tue, 30 Aug 2011 07:35:59 +0000 (10:35 +0300)]
Enable the mmk plugin.

Change-Id: Ibfd62764f17a952bdb85c31717682e8fa5740f99
Reviewed-on: http://codereview.qt.nokia.com/3854
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
6 years agoNot depend on script module.
Xizhi Zhu [Tue, 30 Aug 2011 07:25:27 +0000 (10:25 +0300)]
Not depend on script module.

Change-Id: I33005bb346748fec1bd9e62d7e5cf535fdc07ed6
Reviewed-on: http://codereview.qt.nokia.com/3853
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
6 years agoRemove obsolete testlib files from .gitignore
Jason McDonald [Tue, 23 Aug 2011 05:56:33 +0000 (15:56 +1000)]
Remove obsolete testlib files from .gitignore

Change-Id: I7f3517bd92d45601eaf7f830c8006da712b81161
Reviewed-on: http://codereview.qt.nokia.com/3371
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
6 years agoFix the namespace for QML plugin.
Xizhi Zhu [Thu, 14 Jul 2011 07:31:13 +0000 (10:31 +0300)]
Fix the namespace for QML plugin.

Change-Id: I817dd79921008727dcbde78b83f8a2ec31828ab5
Reviewed-on: http://codereview.qt.nokia.com/1637
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
6 years agoUpdate sync.profile dependencies to new syntax
Alan Alpert [Thu, 7 Jul 2011 08:00:07 +0000 (18:00 +1000)]
Update sync.profile dependencies to new syntax

%dependencies now has a simpler format of gitmodule => %gitref instead
of using qt modules and keywords.

Change-Id: I785f30e24e0a793218e2e307bdde56067760c519
Reviewed-on: http://codereview.qt.nokia.com/1278
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
6 years agoUpdate licenseheader text in source files for qtfeedback Qt module
Jyri Tahtela [Thu, 7 Jul 2011 13:12:18 +0000 (16:12 +0300)]
Update licenseheader text in source files for qtfeedback Qt module

Replace old license header with correct one.

Change-Id: Ibad6d2a9651edc4ff717f216b2a5ccf8edfc649f
Reviewed-on: http://codereview.qt.nokia.com/1315
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
6 years agoInitial commit of modularized QtFeedback.
Xizhi Zhu [Fri, 1 Jul 2011 07:13:44 +0000 (10:13 +0300)]
Initial commit of modularized QtFeedback.

TODO:
1) Remove qmobilitypluginsearch.h
2) Fix auto tests.