| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/sensors/generic/generictiltsensor.cpp
src/sensors/qtapsensor.h
sync.profile
Change-Id: I017a5fa8dffb69b41727495175c0fca9b76962e1
|
| |
| |
| |
| |
| | |
Change-Id: I7901d1527ea02738f37de50ab2c0addcf6d5c927
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
qorientationsensor.h:68:17: error: comma at end of enumerator list [-pedantic]
qsensorgestureplugininterface.h:68:99: error: extra ';' [-pedantic]
qsensorbackend.h:73:5: error: declaration of 'reading' shadows a member of 'this' [-Werror=shadow]
Change-Id: I50a9fc993a3a3c3391f6231ccd2c1976c636045b
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The macro was made empty in qtbase/4ecf82795de54fba530ac9c386f3afff2174edbd
and is no longer necessary or used.
Also, don't generate this macro when using make_sensor.pl
Change-Id: I19121c9f0a1775011f1dd08b9d7d5d85336b1122
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.
Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Change-Id: If3f1040766e1c7de05bb8e90cd8a8a2a349bd096
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|/
|
|
|
| |
Change-Id: Ied2ceac07a5f9dd8a3331e1e2d407620450e138e
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
|
|
|
|
|
| |
Change-Id: I4b442f25f4593f2d957ff572b5ec565ff952818b
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
|
|
|
|
|
|
|
| |
As well as from documentation and usage of Sensors.conf location
Change-Id: I52d657d6799e44a94b3f37bae86445c73e176103
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
| |
Change-Id: I1401314208bb89ba46ed3f18393b1f446682cd93
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
|
|
|
|
|
| |
Change-Id: Ie8636ec443f43b1f238342e0f6f7d321e13dce09
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|
|
|
|
| |
Change-Id: I2b24533d38db1f8e205de19b67fe0b21625bbf6b
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The gesture tests that were part of the sensors2 unit test have
been retained. The tilt sensor tests were not, though they could be
used as a base to make a unit test for the new tilt sensor class.
Change any existing imports to use QtMobility.sensors 1.3.
Change-Id: I8a7130b3c73980fdd577e96c10aecda15e79f8b2
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
|
|
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I85014238e262cb59d8d92b0d708851e82e5633da
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
|
|
|
|
|
| |
Change-Id: Ie6124f99e1fbbbccda47ed144ddd565dd0cc4694
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
|
|
|
|
|
|
|
|
|
| |
It's probably not very likely but during app shutdown, the
Q_GLOBAL_STATIC used in sensor gestures will start returning 0. Check
for this to avoid the chance of a crash.
Change-Id: I4b538ac9b9535bd9439a897d4eab51211c523e33
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
|
|
|
|
|
|
|
| |
remove started and stopped signals and call the manager directly
Change-Id: If2c05576e858c196ab3ba3d786574afbf894ca4b
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
|
|
|
|
|
|
|
| |
wrap with QLatin1Sring
Change-Id: Ifc89212e95b990e45f4c38e8e23e292e5f8cc604
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
|
|
|
|
|
| |
Change-Id: I7f49f14d0546a2a59a26777c6f8fa083ec29e0ba
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
|
|
|
|
|
| |
Change-Id: Ib1f65462a9203534538a18fdc6374fb125cd6f3d
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
The emulator may be missing (eg. when running unit/system tests) so
handle this case without crashing.
Also fix a missing QLatin1String() around a bare string.
Change-Id: Ibeeb0078c1ae12cec4bf8e3f4e81b3a4c72347da
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
|
|
|
|
|
|
|
| |
qFree has been deprecated.
Change-Id: Ie64c791451cb3722183f2ea4d27b9b8e87a4f629
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
|
|
|
|
|
|
|
|
| |
code from the plugin has been moved into the manager so that every other
plugin can be triggered by the emluator.
Change-Id: I37232ab6d45a027541ab1b5c504b2844049ba522
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
|
|
|
|
|
| |
Change-Id: I6d9f674eac15ad5f22de0e5631396c2c9eb1f19f
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
|
|
|
|
|
| |
Change-Id: If07ca2c2c60178fa769cbaf9ac31079d7a9414bd
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Plugins no longer use QFactoryInterface or Q_EXPORT_PLUGIN. Instead,
Q_PLUGIN_METADATA is used.
Meta-data is provided through a .json file that is embedded into the
plugin by moc.
For now, this meta-data is not actually used because both sensors
and gestures use a dynamic registration mechanism.
Change-Id: Ic82657e2ba5768127e13f7411ca51f60772781d8
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was never officially part of the public API. Remove it from
public headers so that it is not accidentally used.
This macro cannot be used with the new Qt plugins.
There are 2 unit tests that use this mechanism and for this reason,
loading of static, legacy plugins will continue but they will use
internal logic to achieve this rather than a macro defined in a
public header.
Change-Id: I3fadcc1ca5c22ea0fc3660584ddba28271d18a89
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
|
|
|
|
|
| |
Change-Id: I4758f401cbf577b2ac7ba772f4897e6334f22900
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
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: I9e809abef666b8498bc481aae9f324b954eff387
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Ideally, this macro would only consist of a Q_EXPORT_PLUGIN /
Q_IMPORT_PLUGIN combination but there is no 'static' version of
Q_EXPORT_PLUGIN available unless we're a static build of Qt.
Thus, this macro duplicates the logic from the correct Q_EXPORT_PLUGIN
macro here.
Use the new code so that we can compile apps that use
REGISTER_STATIC_PLUGIN_V2 (like the unit test).
Using an ifdef so we don't break people who haven't updated qtbase yet.
Refactor the headers so we only have 1 copy of this macro.
Change-Id: Id8c69833029bdd54b66d24dea878b0603b0cb6e9
Reviewed-by: Zsolt Simon <zsolt.simon@nokia.com>
|
|
|
|
|
| |
Change-Id: Ic620a9012472c81f7f1bb15e450638745809effa
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
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: I1ecfbf66a49bb91dd995d92c871ca36148adc645
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
| |
Replace Nokia contact email address with Qt Project website.
Change-Id: Ie8628548cde5d3b251f319cbb6f33e6c08852d9e
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Ided28e5d26af383b019d84ebb128c8ec6d6e3d34
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I7fdedc329cf80f84f1f6e0c6c9da3f7d1ebcd70d
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
QT_END_HEADER
Change-Id: Iac83c311b43b2bba4fd9749027b3cdc91263c5e5
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
QTRY_ instead of custom waiting functions.
Do the thread test properly.
Since it can't possibly work anyway, remove the qt_metacast() function.
Change-Id: I139ab29bc0785bee49a22fa20d10f2970cbac367
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
|
|
|
|
|
|
| |
Change-Id: If31a32c903034585ef8211fa17abb6747e64951f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I9ccdf7e9e15c007879b90877ef54832d01b3c3cd
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Instead of using Q_GLOBAL_STATIC, just create and delete the
QFactoryLoader instances in the singleton objects.
Change-Id: I91ba017b530f0c48a74dc5c0a69fbc8fc20ab250
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Ifdd2031d309a5ac4cbeedc5d7cdb6ba9cbb845c3
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Sanity-Review: Lincoln Ramsay <lincoln.ramsay@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Since pointers to the recognizers can be gotten from the manager, the
methods to control the recognizers that have reference counting should
be the public accessable ones. Make the virtual methods protected.
Change-Id: I176315272ded9d5917133ec7cd329c537445b190
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
|
|
|
|
|
|
|
|
|
| |
qt_metacast was not tested. add Q_ASSERT instead of conditional checking
for object.
Change-Id: Ib8eaa0583d0f8f71b144941a34b1fe9109e85b7a
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I9677535dde72e771b943fa1b0522689c34336824
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Id3deaca92019c964d0d093cc2b04bf1eb043fbbf
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
|
|
|
|
|
|
|
|
| |
signaling needs to begin in the backend singleton
Change-Id: I63453a919a0b5c9e1f093c6269bdfc171a592af9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
|
|
Change-Id: Iada4e8888aad8b7b2180cc0bfb8576a766f75b24
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
|