Commit Graph

80 Commits

Author SHA1 Message Date
Oswald Buddenhagen d520dca735 use centralized handling of QT_BUILD_PARTS
Change-Id: Id4e0244015c828d855e4f3485cf18ef77e48e3d6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-11 23:44:52 +02:00
Thiago Macieira 57aa2f0a11 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>
2012-07-11 23:44:49 +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
Oswald Buddenhagen 846dfb4eeb auto-generate module pris
Change-Id: I008b9ade01b3f043d8e0cdc6653104a4e9d578b2
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-26 14:56:01 +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
Lars Knoll 9610e64f3e 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>
2012-06-05 15:03:42 +02:00
Lars Knoll 13376444a6 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>
2012-06-05 08:56:01 +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
Jaakko Korpela f839320dd7 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>
2012-05-31 08:48:09 +02:00
Toby Tomkins 8fc929f036 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>
2012-05-23 06:40:02 +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
Marius Storm-Olsen 6df20c71fe 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>
2012-05-10 14:43:08 +02:00
Harri Heine b58737deac Documentation: Adding snippets for QML docs
Change-Id: I54fb3ae0e9504cb9c6ed3f9704260e7cecb14a9e
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-05-07 14:47:59 +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
Harri Heine 57b305b4a3 Changing Fileeffects as internal
Change-Id: If9b8c9941e6261ba73b989ba327147b4ab409dd6
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-04-25 10:41: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
Toby Tomkins 92b34648cb Add required QHash header to mmk plugin.
Change-Id: I05ae0be5a29b9d95fcb7cfa2a51b969b464adc10
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-04-19 07:18:52 +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
Mrudul Pendharkar bb8bb715ba Adding plugins.qmltypes
Change-Id: Ib553938996e4c4389d0a3b20c52d509d987e7ff6
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-04-03 16:22:16 +02:00
Pekka Vuorela 834376cc78 Use templated qmlRegisterModuleApi()
Avoids warning when registering types.

Change-Id: I92d3f9d4f623297492f6d641ce3ef680f6ed122f
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-04-03 12:15:39 +02:00
Yuchen Deng d66c41e704 Fix compilation for examples
Change-Id: I2f98e33bba47ed3166475410bf2efe226d669216
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-04-03 08:02:29 +02:00
Pekka Vuorela cff58175dd Use new plugin interface on QtQuick module
Change-Id: I0e0cf8e504e85c2069447ae84f4bf1eb527a1a06
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-03-29 13:50:38 +02:00
Friedemann Kleint fb277cbdcf QtFeedback: Fix warnings about deprecated QtDeclarative headers.
Change-Id: I6260916387a92a69c31eaf7fdfd8d861e9a35514
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-03-16 14:38:10 +01: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
Harri Heine 172635fa17 Documentation: Wording improvements.
Change-Id: Ie36b73bab365018a40144330be70943c498fefa9
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-03-08 13:24:37 +01:00
Jyri Tahtela 5ed1b16ba9 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>
2012-03-05 13:27:02 +01:00
Casper van Donderen ba61ea8fa1 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>
2012-03-02 22:04:22 +01:00
Mrudul Pendharkar 01f6aa56e1 Removing deprecated declarative feedback import
Change-Id: Ia3017227dc66b281f7e3cb067458f6655a2aac46
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-03-02 13:50:11 +01:00
Oswald Buddenhagen 986415f1a3 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>
2012-02-21 20:06:39 +01:00
Eero Hyyti d49d7b3b4f Documentation: \i tag changed to \e for italics.
Change-Id: I14be2c19d34ce41941d0149cf9883f1e3ed37210
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-02-17 11:48:26 +01:00
Eero Hyyti 679673452b Documentation: ifr file extensions changed to ivt.
Change-Id: I2c488927995387df6f11bb3f219091a9ec9acd00
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-02-17 09:24:07 +01:00
Eero Hyyti 986bafb0f9 Documentation: Mobility term changed to Feedback in QFeedbackEffect.
Change-Id: I29693e1767663b198ab4de69321f80d302e90754
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-02-17 09:21:23 +01:00
Mrudul Pendharkar b73c6dabb0 Module Api for declarative ThemeEffect.
Change-Id: Id83d2364acb6ab40624de20e16ab8433409fd1e1
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-02-16 13:41:57 +01:00
Harri Heine 6fcfdc54a0 Documentation: Improved QML feedback page
Change-Id: Ib21e2f379462234270c92bfb942a4249da3e5217
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-02-15 11:25:08 +01:00
Jaakko Korpela c1225fe8be Register both declarative import paths in declarative plugin.
Change-Id: Ida65e63352738926ce4a35e208ab4c394dbfac37
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-02-15 09:44:05 +01:00
Harri Heine 8bfd5741e2 Changed QML feedback plugin doc title
Change-Id: I615861e1caba4fbf252b34b16d95053709cf2e58
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-02-14 15:14:43 +01:00
Harri Heine 5d2834b4ab Removing mobility references from src/imports/feedback
Change-Id: Id61e0be14f35c47db404bb13c7ff67152a235ec9
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-02-13 15:52:02 +01:00
Harri Heine 6f8f4d8f82 Improved Haptics ThemeEffect Example
Change-Id: I6f46ca43a98fc2f6ae28d2a145f5dcbcef42c3b0
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-02-10 11:10:27 +01:00
Harri Heine 248498e1bb Documentation: platform specific things removed from main page.
Removed Symbian and Maemo references.

Change-Id: I471d99349c36a9022a4826a327899e19e2c61581
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-02-09 23:41:11 +01:00
Jaakko Korpela b7b528de0b 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>
2012-02-08 09:57:52 +01:00
Jaakko Korpela b404c78efe 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>
2012-02-07 13:15:04 +01:00
Jaakko Korpela 7a61626edc 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>
2012-02-01 21:38:20 +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 61ac28c488 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>
2012-01-30 01:43:22 +01:00
Eero Hyyti 3d1c6805e6 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>
2012-01-25 10:05:58 +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