| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Assignments in if-clause instead of comparison whilst building list of input devices for a device.
Task-Number: QTMOBILITY-2087
Change-Id: Ic1dc25fa189b3ec930e14e2f05c9a34a636163b7
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
|
|
|
|
|
|
| |
Change-Id: I96513e8b6f09e76998a18edb5411ae06f52cba7c
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
| |
Also fixing some left overs from 8de152a9e1deb533070663cccf6a98e0d374b1d6
Change-Id: I28a91ca233dd835e6e53efbbd7ebd649461f5c04
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: Ie3b9224b2b6a32b417fa0b6643350d45046381e6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
| |
from QmSystem remove/revert if/when QmSystem can be a dependency.
Task-number: QTMOBILITY-1496
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/declarative-systeminfo/declarative-systeminfo.pro
examples/sysinfo/dialog_small_landscape.ui
src/systeminfo/qsysteminfo_s60.cpp
src/systeminfo/systeminfo.pro
|
| |
| |
| |
| | |
Task-number: QTMOBILITY-1447
|
| |
| |
| |
| | |
Task-number: QTMOBILITY-1447
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
Task-number: MOBILITY-2599
|
| |
| |
| |
| | |
Task-number: QTMOBILITY-2583
|
| | |
|
| |
| |
| |
| | |
Task-number: QTMOBILITY-966
|
|/ |
|
|
|
|
| |
does not seem to work on meego or harmattan.
|
|\
| |
| |
| |
| | |
Conflicts:
doc/src/examples/sysinfo.qdoc
|
| | |
|
| |
| |
| |
| | |
ProfileDetails
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
This can be still be done using connectNotify on Symbian or systems
where this can be a cpu intensive process.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
add uuid to example.
|
| |
| |
| |
| | |
Task-number: MOBILITY-1112
|
|/ |
|
| |
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into master-integration
* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo:
some needed opti
style change.
get rid of dbus output.
update text boxes later
ofono has new methods, update to fix.
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
common.pri
doc/src/qtmobility.qdocconf
features/mobility.prf.template
plugins/declarative/multimedia/qdeclarativemediabase.cpp
qtmobility.pro
src/global/qmobilityglobal.h
src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.cpp
src/s60installs/s60installs.pro
src/sensors/qgyroscope.h
src/systeminfo/linux/qsysteminfo_linux.cpp
src/systeminfo/linux/qsysteminfodbushelper_p.h
src/systeminfo/qsysteminfo_linux_common.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: MOBILITY-1599
Reviewed-by: Alexander Abramov
(cherry picked from commit 4910fb9c6178165c38cc531b9718000bee31bfb6)
|
| | | | |
|
| |_|/
|/| | |
|
|/ / |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The said merge commit was a merge from 1.1 to master and lost a number of
changes that were in 1.1 at that time.
This patch was created by doing:
$ git checkout d12ec76 # mainline parent
$ git merge 21b738c # the other parent
(fix merge conflicts)
$ git commit
$ git checkout -b temp-fix1
$ git checkout 99b9918
$ git diff HEAD temp-fix1 | git apply -
$ git add (all the new files)
$ git commit -a
$ git checkout -b temp-fix2
$ git checkout master-from-1.1
$ git cherry-pick temp-fix2
(fix merge conflicts - these are listed below)
Conflicts:
.gitattributes
dist/changes-1.1.0
doc/src/examples.qdoc
examples/declarative-systeminfo/storage/declarative-storage.qrc
examples/sysinfo/dialog.cpp
examples/sysinfo/dialog.h
plugins/multimedia/gstreamer/camerabin/camerabinsession.cpp
src/organizer/details/qorganizeritemdetails.cpp
src/organizer/details/qorganizeritemreminder.h
src/organizer/items/qorganizerevent.h
src/organizer/items/qorganizereventoccurrence.h
src/organizer/items/qorganizerjournal.h
src/organizer/items/qorganizernote.h
src/organizer/items/qorganizertodo.h
src/organizer/items/qorganizertodooccurrence.h
src/organizer/qorganizercollection.cpp
src/organizer/qorganizercollection.h
src/organizer/qorganizercollectionenginelocalid.cpp
src/organizer/qorganizeritemengineid.cpp
src/organizer/qorganizeritemid.cpp
src/organizer/qorganizeritemmanager.cpp
src/organizer/qorganizermanagerengine.cpp
src/serviceframework/ipc/qremoteserviceregister_dbus_p.h
src/serviceframework/ipc/qremoteserviceregister_p.cpp
src/systeminfo/qsystemdeviceinfo.cpp
src/systeminfo/qsystemdeviceinfo.h
src/systeminfo/qsystemdisplayinfo.cpp
src/systeminfo/qsystemscreensaver.cpp
src/systeminfo/qsystemstorageinfo.cpp
tests/auto/auto.pro
tests/auto/contacts.pro
tests/auto/feedback.pro
tests/auto/host.pro
tests/auto/maketestselftest/checktest/main.cpp
tests/auto/multimedia.pro
tests/auto/organizer.pro
tests/auto/qgalleryquerymodel/tst_qgalleryquerymodel.cpp
tests/auto/versit.pro
translations/qtmobility_uk.ts
|
|\| |
|