qt-mobility/qt-mobility.git - Qt Mobility (Qt 4.x)

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update headers	Alexander Abramov	2010-09-15	1	-13/+19
\|
*	Remove QtTelephony Event API	Wolfgang Beck	2010-09-13	1	-6/+3
\|
*	add configure options for public symbols only tests	Alex	2010-09-08	1	-0/+10
\|
*	fix include installtion for VresitOrganizer	Alex	2010-08-26	1	-2/+13
\|
*	Separate out organizer parts of versit to a separate module	Kevin Wu Won	2010-08-20	1	-3/+3
\| \| \| \| \| \| \|	This now generates a new shared library, QtVersitOrganizer.so For clients wishing to use it, they simply need to have: MOBILITY += versit organizer in their .pro file.
*	Move SFW loading of contact actions to a plugin.	Michael Goddard	2010-08-16	1	-4/+0
\| \| \| \|	So contacts doesn't depend on SFW etc.
*	merge latest changes to local branch	Petteri Puolakka	2010-08-13	1	-22/+53
\|
*	Sync doc gallery headers to QtGallery sub directory.	Andrew den Exter	2010-07-01	1	-1/+1
\|
*	Merge branch 'master' of ../qtmobility	Kevin Wu Won	2010-06-30	1	-3/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure configure.bat features/mobility.prf.template src/global/qmobilityglobal.h
\| *	Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobility	Andrew den Exter	2010-06-30	1	-14/+57
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure configure.bat doc/html/annotated.html doc/html/classes.html doc/html/fetchgooglemaps.html doc/html/functions.html doc/html/hierarchy.html doc/html/index.html doc/html/installation.html doc/html/lightmaps.html doc/html/location-overview.html doc/html/location.html doc/html/logfilepositionsource.html doc/html/multimedia.html doc/html/qabstractvideobuffer.html doc/html/qabstractvideosurface.html doc/html/qaudiocapturesource.html doc/html/qaudioencodercontrol.html doc/html/qaudioencodersettings.html doc/html/qaudioendpointselector.html doc/html/qcontactfilter.html doc/html/qgeoareamonitor.html doc/html/qgeocoordinate.html doc/html/qgeopositioninfo.html doc/html/qgeopositioninfosource.html doc/html/qgeosatelliteinfo.html doc/html/qgeosatelliteinfosource.html doc/html/qgraphicsvideoitem.html doc/html/qimageencodercontrol.html doc/html/qimageencodersettings.html doc/html/qmediabindableinterface.html doc/html/qmediacontainercontrol.html doc/html/qmediacontent.html doc/html/qmediacontrol.html doc/html/qmediaimageviewer.html doc/html/qmediaobject.html doc/html/qmediaplayer.html doc/html/qmediaplayercontrol.html doc/html/qmediaplaylist.html doc/html/qmediaplaylistcontrol.html doc/html/qmediaplaylistnavigator.html doc/html/qmediaplaylistprovider.html doc/html/qmediaplaylistreader.html doc/html/qmediaplaylistsourcecontrol.html doc/html/qmediarecorder.html doc/html/qmediarecordercontrol.html doc/html/qmediaresource.html doc/html/qmediaservice.html doc/html/qmediaserviceprovider.html doc/html/qmediaserviceproviderhint.html doc/html/qmediaservicesupportedformatsinterface.html doc/html/qmediastreamscontrol.html doc/html/qmediatimeinterval.html doc/html/qmetadatareadercontrol.html doc/html/qmetadatawritercontrol.html doc/html/qml-audio.html doc/html/qml-video.html doc/html/qmlcontacts-contents-default-svg.html doc/html/qmlcontacts-imageprovider-cpp.html doc/html/qmlcontacts-imageprovider-h.html doc/html/qmlcontacts-plugin-cpp.html doc/html/qmlcontacts-qmlcontactdetail-cpp.html doc/html/qmlcontacts-qmlcontactdetail-h.html doc/html/qmlcontacts-qmlcontactdetailfield-cpp.html doc/html/qmlcontacts-qmlcontactdetailfield-h.html doc/html/qmlcontacts-qmlcontactmodel-cpp.html doc/html/qmlcontacts-qmlcontactmodel-h.html doc/html/qmlcontacts-qmlcontacts-pro.html doc/html/qmlcontacts.html doc/html/qnmeapositioninfosource.html doc/html/qradiotuner.html doc/html/qradiotunercontrol.html doc/html/qservicefilter.html doc/html/qserviceinterfacedescriptor.html doc/html/qservicemanager.html doc/html/qsystemdeviceinfo-members.html doc/html/qsystemdeviceinfo.html doc/html/qsystemdisplayinfo-members.html doc/html/qsystemdisplayinfo.html doc/html/qsysteminfo-members.html doc/html/qsysteminfo.html doc/html/qsystemnetworkinfo-members.html doc/html/qsystemnetworkinfo.html doc/html/qsystemscreensaver-members.html doc/html/qsystemscreensaver.html doc/html/qsystemstorageinfo-members.html doc/html/qsystemstorageinfo.html doc/html/qt-mobility-project-library.dcf doc/html/qt-mobility-project-library.index doc/html/qtmobility-known-issues.html doc/html/qtmobility.qhp doc/html/qtmultimediakit.html doc/html/quickstart.html doc/html/qvideodevicecontrol.html doc/html/qvideoencodercontrol.html doc/html/qvideoencodersettings.html doc/html/qvideoframe.html doc/html/qvideorenderercontrol.html doc/html/qvideosurfaceformat.html doc/html/qvideowidgetcontrol.html doc/html/qvideowindowcontrol.html doc/html/service-frameworks.html doc/html/servicefw.html doc/src/qtmobility.qdocconf examples/examples.pro features/mobility.prf.template plugins/declarative/declarative.pro src/global/qmobilityglobal.h src/src.pro
\| * \	Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobility	Andrew den Exter	2010-06-21	1	-24/+30
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.bat doc/html/annotated.html doc/html/battery-charge.html doc/html/classes.html doc/html/contacts.html doc/html/contactsengines.html doc/html/contactssync.html doc/html/creating-a-sensor-plugin.html doc/html/declarative-sfw-dialer.html doc/html/declarative-sfw-notes.html doc/html/functions.html doc/html/index.html doc/html/installation.html doc/html/location-overview.html doc/html/messaging.html doc/html/multimedia.html doc/html/player-player-cpp.html doc/html/publ-subs.html doc/html/qabstractsecuritysession.html doc/html/qaccelerometer-members.html doc/html/qambientlightsensor-members.html doc/html/qaudiocapturesource-members.html doc/html/qaudiocapturesource.html doc/html/qaudioencodercontrol.html doc/html/qaudioencodersettings-members.html doc/html/qaudioencodersettings.html doc/html/qaudioendpointselector.html doc/html/qcompass-members.html doc/html/qcontactabstractrequest.html doc/html/qcontactdetail.html doc/html/qcontactdetaildefinitionfetchrequest.html doc/html/qcontactdetaildefinitionremoverequest.html doc/html/qcontactdetaildefinitionsaverequest.html doc/html/qcontactdetailfilter.html doc/html/qcontactfetchrequest.html doc/html/qcontactlocalidfetchrequest.html doc/html/qcontactmanager.html doc/html/qcontactrelationshipfetchrequest.html doc/html/qcontactrelationshipremoverequest.html doc/html/qcontactrelationshipsaverequest.html doc/html/qcontactremoverequest.html doc/html/qcontactsaverequest.html doc/html/qcontacturl-members.html doc/html/qgeopositioninfo.html doc/html/qgraphicsvideoitem-members.html doc/html/qgraphicsvideoitem.html doc/html/qimageencodercontrol.html doc/html/qimageencodersettings-members.html doc/html/qimageencodersettings.html doc/html/qmagnetometer-members.html doc/html/qmediabindableinterface-members.html doc/html/qmediacontainercontrol.html doc/html/qmediacontrol.html doc/html/qmediaimageviewer-members.html doc/html/qmediaimageviewer.html doc/html/qmediaobject-members.html doc/html/qmediaobject.html doc/html/qmediaplayer-members.html doc/html/qmediaplayer.html doc/html/qmediaplayercontrol.html doc/html/qmediaplaylist-members.html doc/html/qmediaplaylist.html doc/html/qmediaplaylistcontrol.html doc/html/qmediaplaylistsourcecontrol-members.html doc/html/qmediarecorder-members.html doc/html/qmediarecorder.html doc/html/qmediarecordercontrol-members.html doc/html/qmediarecordercontrol.html doc/html/qmediaservice-members.html doc/html/qmediaservice.html doc/html/qmediaserviceprovider-members.html doc/html/qmediaserviceprovider.html doc/html/qmediaservicesupportedformatsinterface-members.html doc/html/qmediaservicesupportedformatsinterface.html doc/html/qmediastreamscontrol-members.html doc/html/qmediastreamscontrol.html doc/html/qmediatimerange.html doc/html/qmetadatacontrol.html doc/html/qmetadatawritercontrol-members.html doc/html/qmlcontacts-qmlcontactdetailfield-h.html doc/html/qmlcontacts-qmlcontacts-pro.html doc/html/qmlcontacts-qmlcontacts-qrc.html doc/html/qorientationsensor-members.html doc/html/qproximitysensor-members.html doc/html/qradiotuner-members.html doc/html/qradiotuner.html doc/html/qradiotunercontrol-members.html doc/html/qradiotunercontrol.html doc/html/qrotationsensor-members.html doc/html/qservicefilter.html doc/html/qserviceinterfacedescriptor.html doc/html/qsystemdeviceinfo-members.html doc/html/qsystemdeviceinfo.html doc/html/qsystemdisplayinfo-members.html doc/html/qsystemdisplayinfo.html doc/html/qsysteminfo-members.html doc/html/qsysteminfo.html doc/html/qsystemnetworkinfo-members.html doc/html/qsystemnetworkinfo.html doc/html/qsystemscreensaver-members.html doc/html/qsystemscreensaver.html doc/html/qsystemstorageinfo-members.html doc/html/qsystemstorageinfo.html doc/html/qt-mobility-project-library.dcf doc/html/qt-mobility-project-library.index doc/html/qtapsensor-members.html doc/html/qtmobility-known-issues.html doc/html/qtmobility.qhp doc/html/qtmultimediakit.html doc/html/quickstart.html doc/html/qvideoencodercontrol.html doc/html/qvideoencodersettings-members.html doc/html/qvideoencodersettings.html doc/html/qvideooutputcontrol.html doc/html/qvideorenderercontrol.html doc/html/qvideowidget-members.html doc/html/qvideowidget.html doc/html/qvideowidgetcontrol.html doc/html/qvideowindowcontrol.html doc/html/radio-radio-pro.html doc/html/sensors-api.html doc/html/service-frameworks.html doc/html/sysinfo.html doc/html/systeminfo.html doc/html/versit.html src/global/qmobilityglobal.h
\| * \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobility	Andrew den Exter	2010-05-26	1	-50/+99
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.bat doc/html/3rdparty.html doc/html/annotated.html doc/html/audiorecorder-audiorecorder-cpp.html doc/html/audiorecorder-audiorecorder-h.html doc/html/audiorecorder-audiorecorder-pro.html doc/html/audiorecorder-main-cpp.html doc/html/audiorecorder.html doc/html/battery-charge-battery-charge-pro.html doc/html/battery-charge-battery-publisher-battery-publisher-pro.html doc/html/battery-charge-battery-publisher-batterypublisher-cpp.html doc/html/battery-charge-battery-publisher-batterypublisher-h.html doc/html/battery-charge-battery-publisher-main-cpp.html doc/html/battery-charge.html doc/html/bearer-management.html doc/html/bearer.html doc/html/bearercloud-bearercloud-cpp.html doc/html/bearercloud-bearercloud-h.html doc/html/bearercloud-bearercloud-pro.html doc/html/bearercloud-cloud-cpp.html doc/html/bearercloud-cloud-h.html doc/html/bearercloud-icons-qrc.html doc/html/bearercloud-lan-svg.html doc/html/bearercloud-main-cpp.html doc/html/bearercloud-unknown-svg.html doc/html/bearercloud-wlan-svg.html doc/html/bearercloud.html doc/html/bearermonitor-bearermonitor-cpp.html doc/html/bearermonitor-bearermonitor-h.html doc/html/bearermonitor-bearermonitor-pro.html doc/html/bearermonitor-main-cpp.html doc/html/bearermonitor-sessionwidget-cpp.html doc/html/bearermonitor-sessionwidget-h.html doc/html/bearermonitor.html doc/html/bluetoothtransferplugin-bluetoothtransfer-cpp.html doc/html/bluetoothtransferplugin-bluetoothtransfer-h.html doc/html/bluetoothtransferplugin-bluetoothtransferplugin-cpp.html doc/html/bluetoothtransferplugin-bluetoothtransferplugin-h.html doc/html/bluetoothtransferplugin-bluetoothtransferplugin-pro.html doc/html/bluetoothtransferplugin.html doc/html/classes.html doc/html/classlists.html doc/html/contacts.html doc/html/contactsasync.html doc/html/contactsschema.html doc/html/contactssync.html doc/html/creating-a-sensor-plugin.html doc/html/declarative-sfw-dialer-voipdialer-voipdialerplugin-cpp.html doc/html/declarative-sfw-dialer-voipdialer-voipdialerplugin-h.html doc/html/declarative-sfw-dialer.html doc/html/documentmanager-documentmanager-pro.html doc/html/documentmanager.html doc/html/editions.html doc/html/examples.html doc/html/fetchgooglemaps-fetchgooglemaps-pro.html doc/html/fetchgooglemaps-main-cpp.html doc/html/fetchgooglemaps-mapwindow-cpp.html doc/html/fetchgooglemaps-mapwindow-h.html doc/html/fetchgooglemaps.html doc/html/filemanagerplugin-filemanagerplugin-cpp.html doc/html/filemanagerplugin-filemanagerplugin-h.html doc/html/filemanagerplugin-filemanagerplugin-pro.html doc/html/filemanagerplugin-filemanagerstorage-cpp.html doc/html/filemanagerplugin-filemanagerstorage-h.html doc/html/filemanagerplugin-filemanagertransfer-cpp.html doc/html/filemanagerplugin-filemanagertransfer-h.html doc/html/filemanagerplugin.html doc/html/flickrdemo-connectivityhelper-cpp.html doc/html/flickrdemo-connectivityhelper-h.html doc/html/flickrdemo-flickr-icon-svg.html doc/html/flickrdemo-flickrdemo-cpp.html doc/html/flickrdemo-flickrdemo-h.html doc/html/flickrdemo-flickrdemo-pro.html doc/html/flickrdemo-main-cpp.html doc/html/flickrdemo-xqlistwidget-cpp.html doc/html/flickrdemo-xqlistwidget-h.html doc/html/flickrdemo.html doc/html/functions.html doc/html/future.html doc/html/gpl.html doc/html/hierarchy.html doc/html/index.html doc/html/installation.html doc/html/keepintouch-addressfinder-cpp.html doc/html/keepintouch-addressfinder-h.html doc/html/keepintouch-keepintouch-pro.html doc/html/keepintouch-main-cpp.html doc/html/keepintouch.html doc/html/lgpl.html doc/html/licenses-fonts.html doc/html/licenses.html doc/html/licensing.html doc/html/lightmaps-lightmaps-cpp.html doc/html/lightmaps-lightmaps-pro.html doc/html/lightmaps.html doc/html/linereader-members.html doc/html/location-overview.html doc/html/location.html doc/html/logfilepositionsource-clientapplication-cpp.html doc/html/logfilepositionsource-clientapplication-h.html doc/html/logfilepositionsource-logfilepositionsource-cpp.html doc/html/logfilepositionsource-logfilepositionsource-h.html doc/html/logfilepositionsource-logfilepositionsource-pro.html doc/html/logfilepositionsource-main-cpp.html doc/html/logfilepositionsource.html doc/html/mediabrowser-mediabrowser-pro.html doc/html/messaging.html doc/html/mobility.html doc/html/multimedia.html doc/html/opensourceedition.html doc/html/player-main-cpp.html doc/html/player-mediakeysobserver-cpp.html doc/html/player-mediakeysobserver-h.html doc/html/player-player-cpp.html doc/html/player-player-h.html doc/html/player-player-pro.html doc/html/player-playercontrols-cpp.html doc/html/player-playercontrols-h.html doc/html/player-playlistmodel-cpp.html doc/html/player-playlistmodel-h.html doc/html/player-videowidget-cpp.html doc/html/player-videowidget-h.html doc/html/player.html doc/html/preview.html doc/html/publ-subs.html doc/html/publish-subscribe-main-cpp.html doc/html/publish-subscribe-publish-subscribe-pro.html doc/html/publish-subscribe-publisherdialog-cpp.html doc/html/publish-subscribe-publisherdialog-h.html doc/html/publish-subscribe-subscriberdialog-cpp.html doc/html/publish-subscribe-subscriberdialog-h.html doc/html/publish-subscribe.html doc/html/qabstractsecuritysession-members.html doc/html/qabstractsecuritysession.html doc/html/qabstractvaluespacelayer-members.html doc/html/qabstractvaluespacelayer.html doc/html/qaccelerometer-members.html doc/html/qaccelerometer.html doc/html/qaccelerometerfilter-members.html doc/html/qaccelerometerfilter.html doc/html/qaccelerometerreading-members.html doc/html/qaccelerometerreading.html doc/html/qambientlightfilter-members.html doc/html/qambientlightfilter.html doc/html/qambientlightreading-members.html doc/html/qambientlightreading.html doc/html/qambientlightsensor-members.html doc/html/qambientlightsensor.html doc/html/qaudiocapturesource-members.html doc/html/qaudiocapturesource.html doc/html/qaudioencodercontrol-members.html doc/html/qaudioencodercontrol.html doc/html/qaudioencodersettings-members.html doc/html/qaudioencodersettings.html doc/html/qaudioendpointselector-members.html doc/html/qaudioendpointselector.html doc/html/qcompass-members.html doc/html/qcompass.html doc/html/qcompassfilter-members.html doc/html/qcompassfilter.html doc/html/qcompassreading-members.html doc/html/qcompassreading.html doc/html/qcontact-members.html doc/html/qcontact.html doc/html/qcontactabstractrequest-members.html doc/html/qcontactabstractrequest.html doc/html/qcontactaction-members.html doc/html/qcontactaction.html doc/html/qcontactactiondescriptor-members.html doc/html/qcontactactiondescriptor.html doc/html/qcontactactionfactory-members.html doc/html/qcontactactionfactory.html doc/html/qcontactactionfilter-members.html doc/html/qcontactactionfilter.html doc/html/qcontactaddress-members.html doc/html/qcontactaddress.html doc/html/qcontactanniversary-members.html doc/html/qcontactanniversary.html doc/html/qcontactavatar-members.html doc/html/qcontactavatar.html doc/html/qcontactbirthday-members.html doc/html/qcontactbirthday.html doc/html/qcontactchangelogfilter-members.html doc/html/qcontactchangelogfilter.html doc/html/qcontactchangeset-members.html doc/html/qcontactchangeset.html doc/html/qcontactdetail-members.html doc/html/qcontactdetail.html doc/html/qcontactdetaildefinition-members.html doc/html/qcontactdetaildefinition.html doc/html/qcontactdetaildefinitionfetchrequest-members.html doc/html/qcontactdetaildefinitionfetchrequest.html doc/html/qcontactdetaildefinitionremoverequest-members.html doc/html/qcontactdetaildefinitionremoverequest.html doc/html/qcontactdetaildefinitionsaverequest-members.html doc/html/qcontactdetaildefinitionsaverequest.html doc/html/qcontactdetailfielddefinition-members.html doc/html/qcontactdetailfielddefinition.html doc/html/qcontactdetailfilter-members.html doc/html/qcontactdetailfilter.html doc/html/qcontactdetailrangefilter-members.html doc/html/qcontactdetailrangefilter.html doc/html/qcontactdisplaylabel-members.html doc/html/qcontactdisplaylabel.html doc/html/qcontactemailaddress-members.html doc/html/qcontactemailaddress.html doc/html/qcontactfamily-members.html doc/html/qcontactfamily.html doc/html/qcontactfetchhint-members.html doc/html/qcontactfetchhint.html doc/html/qcontactfetchrequest-members.html doc/html/qcontactfetchrequest.html doc/html/qcontactfilter-members.html doc/html/qcontactfilter.html doc/html/qcontactgender-members.html doc/html/qcontactgender.html doc/html/qcontactgeolocation-members.html doc/html/qcontactgeolocation.html doc/html/qcontactglobalpresence-members.html doc/html/qcontactglobalpresence.html doc/html/qcontactguid-members.html doc/html/qcontactguid.html doc/html/qcontactid-members.html doc/html/qcontactid.html doc/html/qcontactintersectionfilter-members.html doc/html/qcontactintersectionfilter.html doc/html/qcontactinvalidengine-members.html doc/html/qcontactinvalidengine.html doc/html/qcontactinvalidfilter-members.html doc/html/qcontactinvalidfilter.html doc/html/qcontactlocalidfetchrequest-members.html doc/html/qcontactlocalidfetchrequest.html doc/html/qcontactlocalidfilter-members.html doc/html/qcontactlocalidfilter.html doc/html/qcontactmanager-members.html doc/html/qcontactmanager.html doc/html/qcontactmanagerengine-members.html doc/html/qcontactmanagerengine.html doc/html/qcontactmanagerenginefactory-members.html doc/html/qcontactmanagerenginefactory.html doc/html/qcontactmemoryengine-members.html doc/html/qcontactmemoryengine.html doc/html/qcontactname-members.html doc/html/qcontactname.html doc/html/qcontactnickname-members.html doc/html/qcontactnickname.html doc/html/qcontactnote-members.html doc/html/qcontactnote.html doc/html/qcontactonlineaccount-members.html doc/html/qcontactonlineaccount.html doc/html/qcontactorganization-members.html doc/html/qcontactorganization.html doc/html/qcontactphonenumber-members.html doc/html/qcontactphonenumber.html doc/html/qcontactpresence-members.html doc/html/qcontactpresence.html doc/html/qcontactrelationship-members.html doc/html/qcontactrelationship.html doc/html/qcontactrelationshipfetchrequest-members.html doc/html/qcontactrelationshipfetchrequest.html doc/html/qcontactrelationshipfilter-members.html doc/html/qcontactrelationshipfilter.html doc/html/qcontactrelationshipremoverequest-members.html doc/html/qcontactrelationshipremoverequest.html doc/html/qcontactrelationshipsaverequest-members.html doc/html/qcontactrelationshipsaverequest.html doc/html/qcontactremoverequest-members.html doc/html/qcontactremoverequest.html doc/html/qcontactringtone-members.html doc/html/qcontactringtone.html doc/html/qcontactsaverequest-members.html doc/html/qcontactsaverequest.html doc/html/qcontactsortorder-members.html doc/html/qcontactsortorder.html doc/html/qcontactsynctarget-members.html doc/html/qcontactsynctarget.html doc/html/qcontacttag-members.html doc/html/qcontacttag.html doc/html/qcontactthumbnail-members.html doc/html/qcontactthumbnail.html doc/html/qcontacttimestamp-members.html doc/html/qcontacttimestamp.html doc/html/qcontacttype-members.html doc/html/qcontacttype.html doc/html/qcontactunionfilter-members.html doc/html/qcontactunionfilter.html doc/html/qcontacturl-members.html doc/html/qcontacturl.html doc/html/qgallerytype-members.html doc/html/qgalleryurlrequest-members.html doc/html/qgeoareamonitor-members.html doc/html/qgeoareamonitor.html doc/html/qgeocoordinate-members.html doc/html/qgeocoordinate.html doc/html/qgeopositioninfo-members.html doc/html/qgeopositioninfo.html doc/html/qgeopositioninfosource-members.html doc/html/qgeopositioninfosource.html doc/html/qgeosatelliteinfo-members.html doc/html/qgeosatelliteinfo.html doc/html/qgeosatelliteinfosource-members.html doc/html/qgeosatelliteinfosource.html doc/html/qgraphicsvideoitem-members.html doc/html/qgraphicsvideoitem.html doc/html/qimageencodercontrol-members.html doc/html/qimageencodercontrol.html doc/html/qimageencodersettings-members.html doc/html/qimageencodersettings.html doc/html/qlatin1constant-members.html doc/html/qmagnetometer-members.html doc/html/qmagnetometer.html doc/html/qmagnetometerfilter-members.html doc/html/qmagnetometerfilter.html doc/html/qmagnetometerreading-members.html doc/html/qmagnetometerreading.html doc/html/qmediacontainercontrol-members.html doc/html/qmediacontainercontrol.html doc/html/qmediacontent-members.html doc/html/qmediacontent.html doc/html/qmediacontrol-members.html doc/html/qmediacontrol.html doc/html/qmediaimageviewer-members.html doc/html/qmediaimageviewer.html doc/html/qmediaobject-members.html doc/html/qmediaobject.html doc/html/qmediaplayer-members.html doc/html/qmediaplayer.html doc/html/qmediaplayercontrol-members.html doc/html/qmediaplayercontrol.html doc/html/qmediaplaylist-members.html doc/html/qmediaplaylist.html doc/html/qmediaplaylistcontrol-members.html doc/html/qmediaplaylistcontrol.html doc/html/qmediaplaylistioplugin-members.html doc/html/qmediaplaylistioplugin.html doc/html/qmediaplaylistnavigator-members.html doc/html/qmediaplaylistnavigator.html doc/html/qmediaplaylistprovider-members.html doc/html/qmediaplaylistprovider.html doc/html/qmediaplaylistreader-members.html doc/html/qmediaplaylistreader.html doc/html/qmediaplaylistwriter-members.html doc/html/qmediaplaylistwriter.html doc/html/qmediarecorder-members.html doc/html/qmediarecorder.html doc/html/qmediarecordercontrol-members.html doc/html/qmediarecordercontrol.html doc/html/qmediaresource-members.html doc/html/qmediaresource.html doc/html/qmediaservice-members.html doc/html/qmediaservice.html doc/html/qmediaservicefeaturesinterface.html doc/html/qmediaserviceprovider-members.html doc/html/qmediaserviceprovider.html doc/html/qmediaserviceproviderhint-members.html doc/html/qmediaserviceproviderhint.html doc/html/qmediaserviceproviderplugin.html doc/html/qmediaservicesupporteddevicesinterface.html doc/html/qmediaservicesupportedformatsinterface.html doc/html/qmediastreamscontrol-members.html doc/html/qmediastreamscontrol.html doc/html/qmediatimeinterval-members.html doc/html/qmediatimeinterval.html doc/html/qmediatimerange-members.html doc/html/qmediatimerange.html doc/html/qmessage-members.html doc/html/qmessage.html doc/html/qmessageaccount-members.html doc/html/qmessageaccount.html doc/html/qmessageaccountfilter-members.html doc/html/qmessageaccountfilter.html doc/html/qmessageaccountid-members.html doc/html/qmessageaccountid.html doc/html/qmessageaccountsortorder-members.html doc/html/qmessageaccountsortorder.html doc/html/qmessageaddress-members.html doc/html/qmessageaddress.html doc/html/qmessagecontentcontainer-members.html doc/html/qmessagecontentcontainer.html doc/html/qmessagecontentcontainerid-members.html doc/html/qmessagecontentcontainerid.html doc/html/qmessagedatacomparator.html doc/html/qmessagefilter-members.html doc/html/qmessagefilter.html doc/html/qmessagefolder-members.html doc/html/qmessagefolder.html doc/html/qmessagefolderfilter-members.html doc/html/qmessagefolderfilter.html doc/html/qmessagefolderid-members.html doc/html/qmessagefolderid.html doc/html/qmessagefoldersortorder-members.html doc/html/qmessagefoldersortorder.html doc/html/qmessageid-members.html doc/html/qmessageid.html doc/html/qmessagemanager-members.html doc/html/qmessagemanager.html doc/html/qmessageservice-members.html doc/html/qmessageservice.html doc/html/qmessagesortorder-members.html doc/html/qmessagesortorder.html doc/html/qmetadatacontrol-members.html doc/html/qmetadatacontrol.html doc/html/qmlcontacts-contents-default-svg.html doc/html/qmlcontacts-main-cpp.html doc/html/qmlcontacts-qmlcontact-cpp.html doc/html/qmlcontacts-qmlcontacts-cpp.html doc/html/qmlcontacts-qmlcontacts-pro.html doc/html/qmlcontacts-qmlcontacts-qrc.html doc/html/qmlcontacts.html doc/html/qnetworkconfiguration-members.html doc/html/qnetworkconfiguration.html doc/html/qnetworkconfigurationmanager-members.html doc/html/qnetworkconfigurationmanager.html doc/html/qnetworksession-members.html doc/html/qnetworksession.html doc/html/qnmeapositioninfosource-members.html doc/html/qnmeapositioninfosource.html doc/html/qorientationfilter-members.html doc/html/qorientationfilter.html doc/html/qorientationreading-members.html doc/html/qorientationreading.html doc/html/qorientationsensor-members.html doc/html/qorientationsensor.html doc/html/qproximityfilter-members.html doc/html/qproximityfilter.html doc/html/qproximityreading-members.html doc/html/qproximityreading.html doc/html/qproximitysensor-members.html doc/html/qproximitysensor.html doc/html/qradiotuner-members.html doc/html/qradiotuner.html doc/html/qradiotunercontrol-members.html doc/html/qradiotunercontrol.html doc/html/qrotationfilter-members.html doc/html/qrotationfilter.html doc/html/qrotationreading-members.html doc/html/qrotationreading.html doc/html/qrotationsensor-members.html doc/html/qrotationsensor.html doc/html/qsensor-members.html doc/html/qsensor.html doc/html/qsensorbackend-members.html doc/html/qsensorbackend.html doc/html/qsensorbackendfactory-members.html doc/html/qsensorbackendfactory.html doc/html/qsensorfilter-members.html doc/html/qsensorfilter.html doc/html/qsensormanager-members.html doc/html/qsensormanager.html doc/html/qsensorplugininterface-members.html doc/html/qsensorplugininterface.html doc/html/qsensorreading-members.html doc/html/qsensorreading.html doc/html/qservice.html doc/html/qservicecontext-members.html doc/html/qservicecontext.html doc/html/qservicefilter-members.html doc/html/qservicefilter.html doc/html/qserviceinterfacedescriptor-members.html doc/html/qserviceinterfacedescriptor.html doc/html/qservicemanager-members.html doc/html/qservicemanager.html doc/html/qserviceplugininterface-members.html doc/html/qserviceplugininterface.html doc/html/qsystemdeviceinfo-members.html doc/html/qsystemdeviceinfo.html doc/html/qsystemdisplayinfo-members.html doc/html/qsystemdisplayinfo.html doc/html/qsysteminfo-members.html doc/html/qsysteminfo.html doc/html/qsystemnetworkinfo-members.html doc/html/qsystemnetworkinfo.html doc/html/qsystemscreensaver-members.html doc/html/qsystemscreensaver.html doc/html/qsystemstorageinfo-members.html doc/html/qsystemstorageinfo.html doc/html/qt-mobility-project-library.dcf doc/html/qt-mobility-project-library.index doc/html/qtapfilter-members.html doc/html/qtapfilter.html doc/html/qtapreading-members.html doc/html/qtapreading.html doc/html/qtapsensor-members.html doc/html/qtapsensor.html doc/html/qtmedia.html doc/html/qtmobility-known-issues.html doc/html/qtmobility.qhp doc/html/querymessages-main-cpp.html doc/html/querymessages-querymessages-pro.html doc/html/querymessages.html doc/html/quickstart-main-cpp.html doc/html/quickstart-quickstart-pro.html doc/html/quickstart.html doc/html/qvaluespace.html doc/html/qvaluespacepublisher-members.html doc/html/qvaluespacepublisher.html doc/html/qvaluespacesubscriber-members.html doc/html/qvaluespacesubscriber.html doc/html/qversitcontactexporter-members.html doc/html/qversitcontactexporter.html doc/html/qversitcontactexporterdetailhandler-members.html doc/html/qversitcontactexporterdetailhandler.html doc/html/qversitcontactimporter-members.html doc/html/qversitcontactimporter.html doc/html/qversitcontactimporterpropertyhandler-members.html doc/html/qversitcontactimporterpropertyhandler.html doc/html/qversitdefaultresourcehandler-members.html doc/html/qversitdefaultresourcehandler.html doc/html/qversitdocument-members.html doc/html/qversitdocument.html doc/html/qversitproperty-members.html doc/html/qversitproperty.html doc/html/qversitreader-members.html doc/html/qversitreader.html doc/html/qversitresourcehandler-members.html doc/html/qversitresourcehandler.html doc/html/qversitwriter-members.html doc/html/qversitwriter.html doc/html/qvideodevicecontrol-members.html doc/html/qvideodevicecontrol.html doc/html/qvideoencodercontrol-members.html doc/html/qvideoencodercontrol.html doc/html/qvideoencodersettings-members.html doc/html/qvideoencodersettings.html doc/html/qvideooutputcontrol-members.html doc/html/qvideooutputcontrol.html doc/html/qvideorenderercontrol-members.html doc/html/qvideorenderercontrol.html doc/html/qvideowidget-members.html doc/html/qvideowidget.html doc/html/qvideowidgetcontrol-members.html doc/html/qvideowidgetcontrol.html doc/html/qvideowindowcontrol-members.html doc/html/qvideowindowcontrol.html doc/html/radio-main-cpp.html doc/html/radio-radio-cpp.html doc/html/radio-radio-h.html doc/html/radio-radio-pro.html doc/html/radio.html doc/html/recorder.html doc/html/samplephonebook-contacteditor-cpp.html doc/html/samplephonebook-contacteditor-h.html doc/html/samplephonebook-contactlistpage-cpp.html doc/html/samplephonebook-contactlistpage-h.html doc/html/samplephonebook-filterpage-cpp.html doc/html/samplephonebook-filterpage-h.html doc/html/samplephonebook-main-cpp.html doc/html/samplephonebook-phonebook-cpp.html doc/html/samplephonebook-phonebook-h.html doc/html/samplephonebook-samplephonebook-pro.html doc/html/samplephonebook.html doc/html/sensors-api.html doc/html/sensors-backend.html doc/html/service-framework-on-symbian.html doc/html/service-frameworks.html doc/html/serviceactions-attachmentlistwidget-cpp.html doc/html/serviceactions-attachmentlistwidget-h.html doc/html/serviceactions-main-cpp.html doc/html/serviceactions-mainwindow-cpp.html doc/html/serviceactions-mainwindow-h.html doc/html/serviceactions-serviceactions-pro.html doc/html/serviceactions.html doc/html/servicebrowser-main-cpp.html doc/html/servicebrowser-servicebrowser-cpp.html doc/html/servicebrowser-servicebrowser-h.html doc/html/servicebrowser-servicebrowser-pro.html doc/html/servicebrowser.html doc/html/servicefw.html doc/html/sfw-notes-sfw-notes-pro.html doc/html/sfw-notes-sfwnotes-qrc.html doc/html/slideshow-main-cpp.html doc/html/slideshow-slideshow-cpp.html doc/html/slideshow-slideshow-h.html doc/html/slideshow-slideshow-pro.html doc/html/slideshow.html doc/html/sysinfo-dialog-cpp.html doc/html/sysinfo-dialog-h.html doc/html/sysinfo-examples-qrc.html doc/html/sysinfo-main-cpp.html doc/html/sysinfo-sysinfo-pro.html doc/html/sysinfo.html doc/html/systeminfo.html doc/html/trademarks.html doc/html/versit.html doc/html/weatherinfo-icons-weather-few-clouds-svg.html doc/html/weatherinfo-icons-weather-fog-svg.html doc/html/weatherinfo-icons-weather-haze-svg.html doc/html/weatherinfo-icons-weather-icy-svg.html doc/html/weatherinfo-icons-weather-overcast-svg.html doc/html/weatherinfo-icons-weather-showers-svg.html doc/html/weatherinfo-icons-weather-sleet-svg.html doc/html/weatherinfo-icons-weather-snow-svg.html doc/html/weatherinfo-icons-weather-storm-svg.html doc/html/weatherinfo-icons-weather-sunny-svg.html doc/html/weatherinfo-icons-weather-sunny-very-few-clouds-svg.html doc/html/weatherinfo-icons-weather-thundershower-svg.html doc/html/weatherinfo-weatherinfo-cpp.html doc/html/weatherinfo-weatherinfo-pro.html doc/html/weatherinfo-weatherinfo-qrc.html doc/html/weatherinfo.html doc/html/writemessage-main-cpp.html doc/html/writemessage-messagesender-cpp.html doc/html/writemessage-messagesender-h.html doc/html/writemessage-writemessage-pro.html doc/html/writemessage.html examples/examples.pro
\| * \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobility	Andrew den Exter	2010-04-09	1	-12/+47
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.bat doc/html/bearer-management.html doc/html/qt-mobility-project-library.dcf doc/html/qt-mobility-project-library.index doc/html/qtmobility.qhp tests/auto/auto.pro
\| * \ \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobility	Andrew den Exter	2010-03-24	1	-3/+25
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.bat doc/html/annotated.html doc/html/cameracapture-cameracapture-cpp.html doc/html/cameracapture-cameracapture-h.html doc/html/cameracapture-cameracapture-pro.html doc/html/cameracapture-main-cpp.html doc/html/cameracapture-settings-cpp.html doc/html/cameracapture-settings-h.html doc/html/cameracapture.html doc/html/classes.html doc/html/declarative-declarative-pro.html doc/html/declarative-demo-demo-pro.html doc/html/declarative-landlinedialer-landlinedialer-cpp.html doc/html/declarative-landlinedialer-landlinedialer-h.html doc/html/declarative-landlinedialer-landlinedialer-pro.html doc/html/declarative-landlinedialer-landlinedialerplugin-cpp.html doc/html/declarative-landlinedialer-landlinedialerplugin-h.html doc/html/declarative-main-cpp.html doc/html/declarative-sfwexample-cpp.html doc/html/declarative-sfwexample-h.html doc/html/declarative-voipdialer-voipdialer-cpp.html doc/html/declarative-voipdialer-voipdialer-h.html doc/html/declarative-voipdialer-voipdialer-pro.html doc/html/declarative-voipdialer-voipdialerplugin-cpp.html doc/html/declarative-voipdialer-voipdialerplugin-h.html doc/html/functions.html doc/html/future.html doc/html/preview.html doc/html/qcamera-members.html doc/html/qcamera.html doc/html/qcameracontrol-members.html doc/html/qcameracontrol.html doc/html/qcameraexposurecontrol-members.html doc/html/qcameraexposurecontrol.html doc/html/qcamerafocuscontrol-members.html doc/html/qcamerafocuscontrol.html doc/html/qcontactdetaildefinition-obsolete.html doc/html/qcontactdetailfielddefinition-obsolete.html doc/html/qcontactmanager.html doc/html/qcontactrelationship-obsolete.html doc/html/qimagecapturecontrol-members.html doc/html/qimagecapturecontrol.html doc/html/qimageprocessingcontrol-members.html doc/html/qimageprocessingcontrol.html doc/html/qml-audio.html doc/html/qml-qsoundeffect.html doc/html/qml-video.html doc/html/qstillimagecapture-members.html doc/html/qstillimagecapture.html doc/html/qt-mobility-project-library.index doc/html/qtmobility.qhp doc/html/qversitreader.html doc/html/sensors-api.html doc/html/streamplayer-main-cpp.html doc/html/streamplayer-streamplayer-cpp.html doc/html/streamplayer-streamplayer-h.html doc/html/streamplayer-streamplayer-pro.html doc/html/streamplayer.html
\| * \ \ \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobility	Andrew den Exter	2010-03-04	1	-1/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.bat doc/html/annotated.html doc/html/classes.html doc/html/functions.html
\| * \| \| \| \| \| \|	Test doc gallery request and response classes, and fix exports.	Andrew den Exter	2010-02-22	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Draft Document Gallery API.	Andrew den Exter	2010-02-18	1	-1/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	no backend for Maemo6 yet. disable messaging altogether	Alex	2010-02-05	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix a bad merge	Kevin Wu Won	2010-06-30	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobility	Chris Adams	2010-06-30	1	-16/+58
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure configure.bat features/mobility.prf.template plugins/plugins.pro src/global/qmobilityglobal.h src/src.pro
\| * \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobility	Chris Adams	2010-06-30	1	-10/+12
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure configure.bat examples/examples.pro src/src.pro
\| \| * \ \ \ \ \ \	Merge branch 'master' of ../qtmobility	Wolfgang Beck	2010-06-29	1	-51/+87
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.bat doc/html/annotated.html doc/html/classes.html doc/html/functions.html doc/html/index.html doc/html/qt-mobility-project-library.dcf doc/html/qt-mobility-project-library.index doc/html/qtmobility.qhp examples/examples.pro plugins/declarative/declarative.pro src/global/qmobilityglobal.h
\| \| * \ \ \ \ \ \ \	Merge branch 'master' of ../qtmobility	Alex	2010-05-20	1	-35/+157
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure configure.bat doc/html/annotated.html doc/html/audiorecorder-audiorecorder-cpp.html doc/html/cameracapture-cameracapture-cpp.html doc/html/cameracapture-cameracapture-h.html doc/html/cameracapture-settings-cpp.html doc/html/classes.html doc/html/functions.html doc/html/index.html doc/html/multimedia.html doc/html/player-player-cpp.html doc/html/qaudiocapturesource-members.html doc/html/qaudiocapturesource.html doc/html/qaudioencodersettings.html doc/html/qaudioendpointselector-members.html doc/html/qaudioendpointselector.html doc/html/qcamera-members.html doc/html/qcamera.html doc/html/qcameracontrol-members.html doc/html/qcameracontrol.html doc/html/qcameraexposurecontrol-members.html doc/html/qcameraexposurecontrol.html doc/html/qcamerafocuscontrol-members.html doc/html/qcamerafocuscontrol.html doc/html/qgraphicsvideoitem.html doc/html/qimagecapturecontrol-members.html doc/html/qimagecapturecontrol.html doc/html/qmediacontainercontrol-members.html doc/html/qmediacontainercontrol.html doc/html/qmediacontent.html doc/html/qmediacontrol.html doc/html/qmediaimageviewer-members.html doc/html/qmediaobject-members.html doc/html/qmediaobject.html doc/html/qmediaplayer-members.html doc/html/qmediaplayer.html doc/html/qmediarecorder-members.html doc/html/qmediarecorder.html doc/html/qmediaresource-members.html doc/html/qmediaresource.html doc/html/qmediaservicesupportedformatsinterface-members.html doc/html/qmediaservicesupportedformatsinterface.html doc/html/qradiotuner-members.html doc/html/qradiotuner.html doc/html/qradiotunercontrol-members.html doc/html/qradiotunercontrol.html doc/html/qstillimagecapture-members.html doc/html/qt-mobility-project-library.dcf doc/html/qt-mobility-project-library.index doc/html/qtmedia.html doc/html/qtmobility.qhp doc/html/qvideoencodersettings.html doc/html/radio-radio-h.html doc/html/slideshow-slideshow-cpp.html doc/html/writemessage-messagesender-cpp.html doc/src/qtmobility.qdocconf features/mobility.prf.template src/global/qmobilityglobal.h tests/auto/support/support.pri
\| \| * \| \| \| \| \| \| \| \|	hook telephony into configure's modules slection process and generate	Alex	2010-05-20	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	convenience headers
\| \| * \| \| \| \| \| \| \| \|	MOBILITY-394, add telephony event API source + documents	Wolfgang Beck	2010-05-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Include path fixes for Organizer	Kevin Wu Won	2010-06-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configure was incorrectly putting it in QtmOrganizer (not QtOrganizer) mobility.prf wasn't setting the QtOrganizer includepath
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'mastermerge' of scm.dev.nokia.troll.no:qtmobility/qtm-contacts	Chris Adams	2010-06-29	1	-2/+50
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.bat examples/examples.pro plugins/declarative/declarative.pro
\| \| * \| \| \| \| \| \| \| \|	Merge branch '1.0'	Alex	2010-06-28	1	-0/+1
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/declarative/contacts/contacts.pro src/systeminfo/qsysteminfo_linux_common.cpp
\| \| \| * \| \| \| \| \| \| \| \|	remove Bluez from SystemInfo if the platform doesn't have Bluez support	Alex	2010-06-28	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTMOBILITY-356 Reviewed-by: Lorn Potter
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of ../qtmobility	Alex	2010-06-28	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.bat demos/qmlcontacts/qmlcontacts.pro
\| \| \| * \| \| \| \| \| \| \| \| \|	Merge branch '1.0'	Don Sanders	2010-06-28	1	-1/+1
\| \| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.bat doc/html/lightmaps.html
\| \| \| \| * \| \| \| \| \| \| \|	Merge branch '1.0' of ../qtmobility into 1.0	Alex	2010-06-23	1	-24/+19
\| \| \| \| \|\ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \| \|	Fix cross compiling bug	Andrew Stanley-Jones	2010-06-22	1	-1/+1
\| \| \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: MOBILITY-773
\| \| * \| / \| \| \| \| \| \| \|	add support for -examplesdir and -demosdir configure option	Alex	2010-06-22	1	-1/+37
\| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTMOBILITY-320
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of ../qtm-contacts	Kevin Wu Won	2010-06-17	1	-51/+38
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure configure.bat examples/examples.pro qtmobility.pro src/global/qmobilityglobal.h
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of ../qtm-contacts	Kevin Wu Won	2010-05-27	1	-2/+24
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/plugins.pro src/versit/qversitreader_p.cpp src/versit/qversitreader_p.h
\| * \| \| \| \| \| \| \| \| \|	Rename calendar to organizer, for all organizer related instances	Chris Adams	2010-05-12	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also update various project files and defines where required.
\| * \| \| \| \| \| \| \| \| \|	Start hooking up the build system stuff.	Michael Goddard	2010-04-30	1	-5/+9
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobility	Michael Goddard	2010-06-23	1	-58/+180
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure configure.bat features/mobility.prf.template plugins/plugins.pro src/global/qmobilityglobal.h
\| * \| \| \| \| \| \| \| \| \|	first demo separation	Alex	2010-06-07	1	-0/+11
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	comply with standard include path practise in Qt	Alex	2010-06-04	1	-16/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change adds support for the following include styles: \#include <QtLibraryName/Class> \#include <QtLibraryName/class.h> so far the only supported style was: \#include <Class> \#include <class.h> Task-number: MOBILITY-1087
\| * \| \| \| \| \| \| \| \|	remove old and obsolete configure checks for QtMultimedia	Alex	2010-06-04	1	-27/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	both libraries (QtMultimedia and QtMultimediaKit) can live alongside each other
\| * \| \| \| \| \| \| \| \|	Sync headers to correct path.	Justin McPherson	2010-06-03	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix deployment of multimedia headers (was broken by recent Multimedia changes)	Alex	2010-06-02	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use operator compatible with other /bin/sh implementations.	Justin McPherson	2010-06-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	configure; do not exit if multimedia can not be built.	Justin McPherson	2010-05-28	1	-13/+23
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch '1.0' of git@scm.dev.nokia.troll.no:qtmobility/qtmobility into 1.0	Justin McPherson	2010-05-28	1	-46/+83
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: config.tests/lbt/lbt.pro configure configure.bat dist/changes-1.0.0 doc/src/installation.qdoc examples/player/player.cpp plugins/declarative/declarative.pro plugins/multimedia/symbian/mmf/mmf.pro plugins/multimedia/symbian/openmaxal/mediarecorder/mediarecorder.pro src/multimedia/multimedia.pro src/multimedia/qvideooutputcontrol.cpp src/multimedia/video/qimagevideobuffer.cpp tests/auto/qaudiooutput/wavheader.h
\| \| * \| \| \| \| \| \| \|	fix -prefix handling by configure sehell script	Alex	2010-05-24	1	-26/+18
\| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1.) avoid unintentional removal of existing directories 2.) handle error case of Maemo5 prefix 3.) permit ./configure without having write permission for final install path Task-number: QTMOBILITY-50 QTMOBILITY-264 MOBILITY-971
\| \| * \| \| \| \| \| \|	Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtmobility into 1.0	Michael Goddard	2010-05-18	1	-2/+28
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure examples/qmlcontacts/qmlcontact.cpp examples/qmlcontacts/qmlcontact.h examples/qmlcontacts/qmlcontacts.cpp examples/qmlcontacts/qmlcontactsa.h plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend.cpp plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend_p.h plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro plugins/contacts/qtcontacts-tracker/qtrackercontactasyncrequest.h plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.cpp plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.h plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.cpp plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.h plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.cpp plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.h plugins/contacts/qtcontacts-tracker/qtrackercontactslive.cpp plugins/contacts/qtcontacts-tracker/qtrackercontactslive.h plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.cpp plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.h plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.cpp plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.h plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.cpp plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.h plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_common/ut_qtcontacts_common.h plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.cpp plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.h plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.cpp plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.h plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.cpp plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.h plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.h plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.cpp plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.h plugins/contacts/qtcontacts-tracker/trackerchangelistener.cpp plugins/contacts/qtcontacts-tracker/trackerchangelistener.h
\| \| \| * \| \| \| \| \| \|	Bump copyright date from 2009 to 2010	dac	2010-05-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \|