summaryrefslogtreecommitdiffstats
path: root/examples/sysinfo/dialog.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Fix listing input devices in qsysinfo example.Sampo Saaristo2013-01-281-6/+6
| | | | | | | | 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>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-101-1/+1
| | | | | | Change-Id: I96513e8b6f09e76998a18edb5411ae06f52cba7c Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update to new license formatSergio Ahumada2012-11-071-4/+4
| | | | | | | Also fixing some left overs from 8de152a9e1deb533070663cccf6a98e0d374b1d6 Change-Id: I28a91ca233dd835e6e53efbbd7ebd649461f5c04 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaSergio Ahumada2012-11-071-3/+3
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie3b9224b2b6a32b417fa0b6643350d45046381e6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* fix currentFlow on harmattanLorn Potter2011-04-071-0/+4
| | | | | | from QmSystem remove/revert if/when QmSystem can be a dependency. Task-number: QTMOBILITY-1496
* add alignedtimer to sysinfo exampleLorn Potter2011-03-291-6/+176
|
* add cellIdChanged to exampleLorn Potter2011-03-281-0/+7
|
* Merge branch 'master' into 1.3Lorn Potter2011-03-231-93/+309
|\ | | | | | | | | | | | | | | Conflicts: examples/declarative-systeminfo/declarative-systeminfo.pro examples/sysinfo/dialog_small_landscape.ui src/systeminfo/qsysteminfo_s60.cpp src/systeminfo/systeminfo.pro
| * fix maemo6 lockStatus and fix example to show it.Lorn Potter2011-03-231-6/+8
| | | | | | | | Task-number: QTMOBILITY-1447
| * add old lock type status for testingLorn Potter2011-03-231-10/+27
| | | | | | | | Task-number: QTMOBILITY-1447
| * fix msvc buildLorn Potter2011-03-221-2/+8
| |
| * make sire to use human readable when storage changedLorn Potter2011-03-211-1/+1
| |
| * add color per storage state and make storage size human readable.Lorn Potter2011-03-211-2/+34
| |
| * remove packet service from network modes.Lorn Potter2011-03-111-66/+29
| |
| * fix spelling errorLorn Potter2011-03-091-3/+2
| |
| * add backlightStatus to qsysinfo exampleLorn Potter2011-03-071-0/+24
| |
| * style changeLorn Potter2011-02-231-66/+66
| |
| * update sysinfo example for new modesLorn Potter2011-02-231-34/+183
| |
| * fix storageStateChanged on linux.Lorn Potter2011-02-221-0/+27
| | | | | | | | Task-number: MOBILITY-2599
| * fix keyboardFLipped signal on maemo6Lorn Potter2011-02-211-0/+6
| | | | | | | | Task-number: QTMOBILITY-2583
| * use inhibitedLorn Potter2011-02-101-11/+1
| |
| * refactor screensaver class.Lorn Potter2011-02-101-10/+11
| | | | | | | | Task-number: QTMOBILITY-966
* | Thermal State and Changes example and auto tests addedkranthi2011-02-181-1/+35
|/
* orientationChanged signal for linux desktop using xrandr stuff.Lorn Potter2011-02-071-28/+38
| | | | does not seem to work on meego or harmattan.
* Merge branch 'master' of ../qtmobilityLorn Potter2011-01-281-1/+4
|\ | | | | | | | | Conflicts: doc/src/examples/sysinfo.qdoc
| * Docs: change to snippets in SysInfo example.Peter Yard2011-01-271-1/+4
| |
* | getActiveProfileDetails -> activeProfileDetails, ActiveProfileDetails ->Lorn Potter2011-01-211-1/+1
| | | | | | | | ProfileDetails
* | getOrientation -> orientationLorn Potter2011-01-141-1/+1
| |
* | dont initialize the flags with 0.Lorn Potter2011-01-131-5/+3
| |
* | fix keyboard types in guiLorn Potter2011-01-131-17/+13
| |
* | use flags for LockType, as pin and keys can both be locked at onceLorn Potter2010-12-171-1/+1
| |
* | clarify LockTypesLorn Potter2010-12-171-14/+8
| |
* | remove startCurrentMeasurement function.Lorn Potter2010-12-161-7/+1
| | | | | | | | | | This can be still be done using connectNotify on Symbian or systems where this can be a cpu intensive process.
* | dont use a pointer to ActiveProfileDetailsLorn Potter2010-12-151-4/+4
| |
* | rename and clarify.Lorn Potter2010-12-141-3/+3
| |
* | remove voltageChanged as per API discussions.Lorn Potter2010-12-141-2/+0
| |
* | add some new things.Lorn Potter2010-12-101-0/+52
| |
* | hal is unrelyable for getting uuid.Lorn Potter2010-12-091-1/+7
| | | | | | | | add uuid to example.
* | fm transmitter.Lorn Potter2010-12-091-0/+3
| | | | | | | | Task-number: MOBILITY-1112
* | hostID -> uniqueIDLorn Potter2010-12-021-1/+1
|/
* add hostIdLorn Potter2010-12-021-0/+2
|
* Merge branch 'master' into batteryinfoLorn Potter2010-11-191-1/+1
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo ↵Qt Continuous Integration System2010-11-101-4/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * \ Merge remote branch 'origin/1.1' into master-from-1.1Andrew Stanley-Jones2010-11-101-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Added/Modified licence headers. Fixed copyright year.Toby Tomkins2010-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: MOBILITY-1599 Reviewed-by: Alexander Abramov (cherry picked from commit 4910fb9c6178165c38cc531b9718000bee31bfb6)
* | | | hook up signals and update example application for new batteryinfoLorn Potter2010-11-181-11/+25
| | | |
* | | | update examples appLorn Potter2010-11-171-60/+129
| |_|/ |/| |
* | | update text boxes laterLorn Potter2010-11-091-4/+6
|/ /
* | Fix merge commit 99b99185ca6b91158e109a1e636fa510cb2389caKevin Wu Won2010-10-291-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge remote branch 'origin/1.1' into master-from-1.1Rohan McGovern2010-10-261-19/+40
|\|