Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobility

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

1 files changed, 99 insertions, 50 deletions

diff --git a/configure b/configure
index 5936c4ea22..c0a1be973e 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 #############################################################################
 ##
-## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ## All rights reserved.
 ## Contact: Nokia Corporation (qt-info@nokia.com)
 ##
@@ -42,7 +42,7 @@
 
 # return status of 1 if absolute path as first argument
 # also prints the return status
-function isAbsPath() {
+isAbsPath() {
     slash=$(echo $1 | cut -c 1)
     if [ "$slash" != "/" ]; then
         echo 0
@@ -57,18 +57,17 @@ function isAbsPath() {
 # This is required because when building in scratchbox for
 # maemo we do not want to follow symbolic links that are 
 # introduced by scratchbox
-function absPath() {
-    
+absPath() {
     if [ "$2" = "maemo5" -o "$2" = "maemo6" ]; then
         if [ `isAbsPath $1` = '1' ]; then
             echo $1;
         else
-            echo "Relative prefix paths are not supported for Maemo"
+            echo >&2 "Relative prefix/bin/lib/header/plugin paths are not supported for Maemo"
             exit 1;
         fi
     else
-        RESULT=`(cd "$1"; /bin/pwd)`
-        echo $RESULT
+        PATH=`$relpath/bin/pathhelper $1`
+        echo $PATH
     fi
 }
 
@@ -86,24 +85,30 @@ QT_MOBILITY_PREFIX=$shadowpath/install
 QT_MOBILITY_INCLUDE=
 QT_MOBILITY_LIB=
 QT_MOBILITY_BIN=
+QT_MOBILITY_PLUGINS=
 BUILD_UNITTESTS=
 BUILD_EXAMPLES=
 BUILD_DOCS=yes
+BUILD_TOOLS=yes
 RELEASEMODE=
 BUILD_SILENT=
 LINUX_TARGET=
 QMAKE_CACHE="$shadowpath/.qmake.cache"
 LIB_PATH="lib"
 BIN_PATH="bin"
+PLUGIN_PATH="plugins"
 MAC_SDK=
 MOBILITY_MODULES="bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors gallery"
 MOBILITY_MODULES_UNPARSED=
+QMKSPEC=
+OS="other"
 
 usage() 
 {
     echo "Usage: configure [-prefix <dir>] [headerdir <dir>] [libdir <dir>]"
     echo "                 [-bindir <dir>] [-tests] [-examples] [-no-docs]"
-    echo "                 [-debug] [-release] [-silent] [-modules <list>]"
+    echo "                 [-no-tools] [-debug] [-release] [-silent]"
+    echo "                 [-modules <list>]"
     echo
     echo "Options:"
     echo
@@ -115,6 +120,8 @@ usage()
     echo "                    (default PREFIX/lib)"
     echo "-bindir <dir> ..... Executables will be installed to <dir>"
     echo "                    (default PREFIX/bin)"
+    echo "-plugindir <dir> .. Plug-ins will be installed to <dir>"
+    echo "                    (default PREFIX/plugins)"
     echo "-debug ............ Build with debugging symbols"
     echo "-release .......... Build without debugging symbols"
     echo "-silent ........... Reduces build output"
@@ -123,6 +130,7 @@ usage()
     echo "                    and should not be used for release builds."
     echo "-examples ......... Build example applications"
     echo "-no-docs .......... Do not build documentation (build by default)"
+    echo "-no-tools ......... Do not build tools (build by default)"
     echo "-modules <list> ... Restrict list of modules to build (default all supported)"
     echo "                    Choose from: bearer contacts gallery location publishsubscribe"
     echo "                    messaging multimedia systeminfo serviceframework versit"
@@ -166,6 +174,10 @@ while [ "$#" -gt 0 ]; do
             QT_MOBILITY_BIN="$2"
             shift
             ;;
+        -plugindir)
+            QT_MOBILITY_PLUGINS="$2"
+            shift
+            ;;
         -tests)
             BUILD_UNITTESTS="yes"
             ;;
@@ -175,6 +187,9 @@ while [ "$#" -gt 0 ]; do
         -no-docs)
             BUILD_DOCS=
             ;;
+        -no-tools)
+            BUILD_TOOLS=
+            ;;
         -debug)
             RELEASEMODE=debug
             ;;
@@ -226,13 +241,23 @@ while [ "$#" -gt 0 ]; do
     shift
 done
 
+checkostype()
+{
+    match="darwin" 
+    if [ "$OSTYPE" = "${match}"* ]; then
+        OS="darwin"
+        QMKSPEC="-spec macx-g++"
+        echo "QMAKESPEC = "$QMKSPEC >> "$CONFIG_IN"
+    fi
+}
+
 findframeworks()
 {
 # figure out if Qt was built with frameworks
 # if so, install in the correct place.
 # and fix rpath
     echo "contains(QT_CONFIG,qt_framework):message(1)" > 1.pro
-    SOMETHING=`qmake 1.pro 2>&1`
+    SOMETHING=`qmake -spec macx-g++ 1.pro 2>&1`
         if [ "$SOMETHING" = "Project MESSAGE: 1" ]; then
             LIB_PATH="Library/Frameworks"
             BIN_PATH="Applications"
@@ -240,7 +265,6 @@ findframeworks()
     rm 1.pro
 }
 
-findframeworks
 
 findUniversal()
 {
@@ -251,19 +275,26 @@ findUniversal()
     echo "contains(QT_CONFIG,ppc): system(echo CONFIG+=ppc >> mac.inc)" >> 2.pro
     echo "contains(QT_CONFIG,ppc64): system(echo CONFIG+=ppc64 >> mac.inc)" >> 2.pro
     echo "contains(QT_CONFIG,x86_64): system(echo CONFIG+=x86_64 >> mac.inc)" >> 2.pro
-    SOMETIME=`qmake 2.pro 2>&1`
+    SOMETIME=`qmake -spec macx-g++ 2.pro 2>&1`
     rm 2.pro
     if [ -e "mac.inc" ]; then 
          echo "exists(mac.inc): include(mac.inc)" >> "$CONFIG_IN"
     fi
 }
 
+checkostype
+
+if [ "$OS" = "darwin" ] ; then
+    findframeworks
+fi
 
 if [ -n "$BUILD_SILENT" ]; then
     echo "CONFIG += silent"  > "$CONFIG_IN"
 fi
 
-findUniversal
+if [ "$OS" = "darwin" ] ; then
+    findUniversal
+fi
 
 if [ -z "$RELEASEMODE" ]; then
     RELEASEMODE="debug"
@@ -280,24 +311,20 @@ if [ -n "$LINUX_TARGET" ]; then
 fi
 
 #process PREFIX
-if [ -d "$QT_MOBILITY_PREFIX" ]; then
-    QT_MOBILITY_PREFIX=`absPath $QT_MOBILITY_PREFIX $LINUX_TARGET`
-else
-    mkdir -p "$QT_MOBILITY_PREFIX"
-    QT_MOBILITY_PREFIX=`absPath $QT_MOBILITY_PREFIX $LINUX_TARGET`
-    rm -rf "$QT_MOBILITY_PREFIX"
+QT_MOBILITY_PREFIX=`absPath $QT_MOBILITY_PREFIX $LINUX_TARGET`
+if [ "$?" -eq "1" ]; then
+    exit 1
 fi
 echo "QT_MOBILITY_PREFIX = $QT_MOBILITY_PREFIX" >> "$CONFIG_IN"
 
 #process include path
 if [ -z "$QT_MOBILITY_INCLUDE" ]; then
     QT_MOBILITY_INCLUDE="$QT_MOBILITY_PREFIX/include"
-elif [ -d "$QT_MOBILITY_INCLUDE" ]; then
-    QT_MOBILITY_INCLUDE=`absPath $QT_MOBILITY_INCLUDE $LINUX_TARGET`
 else
-    mkdir -p "$QT_MOBILITY_INCLUDE"
     QT_MOBILITY_INCLUDE=`absPath $QT_MOBILITY_INCLUDE $LINUX_TARGET`
-    rm -rf "$QT_MOBILITY_INCLUDE"
+    if [ "$?" -eq "1" ]; then
+        exit 1
+    fi
 fi
 echo "QT_MOBILITY_INCLUDE = $QT_MOBILITY_INCLUDE" >> "$CONFIG_IN"
 
@@ -305,27 +332,37 @@ echo "QT_MOBILITY_INCLUDE = $QT_MOBILITY_INCLUDE" >> "$CONFIG_IN"
 #process library path
 if [ -z "$QT_MOBILITY_LIB" ]; then
     QT_MOBILITY_LIB="$QT_MOBILITY_PREFIX/$LIB_PATH"
-elif [ -d "$QT_MOBILITY_LIB" ]; then
-    QT_MOBILITY_LIB=`absPath $QT_MOBILITY_LIB $LINUX_TARGET`
 else
-    mkdir -p "$QT_MOBILITY_LIB"
     QT_MOBILITY_LIB=`absPath $QT_MOBILITY_LIB $LINUX_TARGET`
-    rm -rf "$QT_MOBILITY_LIB"
+    if [ "$?" -eq "1" ]; then
+        exit 1
+    fi
 fi
 echo "QT_MOBILITY_LIB = $QT_MOBILITY_LIB" >> "$CONFIG_IN"
 
-#process binary path
+#process bin path
 if [ -z "$QT_MOBILITY_BIN" ]; then
     QT_MOBILITY_BIN="$QT_MOBILITY_PREFIX/$BIN_PATH"
-elif [ -d "$QT_MOBILITY_BIN" ]; then
-    QT_MOBILITY_BIN=`absPath $QT_MOBILITY_BIN $LINUX_TARGET`
 else
-    mkdir -p "$QT_MOBILITY_BIN"
     QT_MOBILITY_BIN=`absPath $QT_MOBILITY_BIN $LINUX_TARGET`
-    rm -rf "$QT_MOBILITY_BIN"
+    if [ "$?" -eq "1" ]; then
+        exit 1
+    fi
 fi
 echo "QT_MOBILITY_BIN = $QT_MOBILITY_BIN" >> "$CONFIG_IN"
 
+#process plugin path
+if [ -z "$QT_MOBILITY_PLUGINS" ]; then
+    QT_MOBILITY_PLUGINS="$QT_MOBILITY_PREFIX/$PLUGIN_PATH"
+else
+    QT_MOBILITY_PLUGINS=`absPath $QT_MOBILITY_PLUGINS $LINUX_TARGET`
+    if [ "$?" -eq "1" ]; then
+        exit 1
+    fi
+fi
+echo "QT_MOBILITY_PLUGINS = $QT_MOBILITY_PLUGINS" >> "$CONFIG_IN"
+
+
 echo "QT_MOBILITY_SOURCE_TREE = $relpath" >> "$QMAKE_CACHE"
 echo "QT_MOBILITY_BUILD_TREE = $shadowpath" >> "$QMAKE_CACHE"
 
@@ -352,6 +389,12 @@ else
     echo "build_docs = yes" >> "$CONFIG_IN"
 fi
 
+if [ -z "$BUILD_TOOLS" ]; then
+    echo "build_tools = no" >> "$CONFIG_IN"
+else
+    echo "build_tools = yes" >> "$CONFIG_IN"
+fi
+
 echo "Configuring Qt Mobility"
 echo 
 
@@ -396,7 +439,7 @@ compileTest()
         cd config.tests/$2
     fi
 
-    qmake "$relpath/config.tests/$2/$2.pro" 2>> "$CONFIG_LOG" >> "$CONFIG_LOG"
+    qmake $QMKSPEC "$relpath/config.tests/$2/$2.pro" 2>> "$CONFIG_LOG" >> "$CONFIG_LOG"
     printf  " ."
     "$MAKE" clean >> "$CONFIG_LOG"
     printf "."
@@ -418,6 +461,12 @@ compileTest NetworkManager networkmanager
 compileTest "CoreWLAN (MacOS 10.6)" corewlan
 compileTest "Maemo ICD" maemo-icd
 compileTest "Maemo ICD WLAN" maemo-icd-network-wlan
+compileTest "Maemo5 contacts dependencies" maemo5-contacts
+if [ "$LINUX_TARGET" = maemo6 ]; then
+    compileTest sensord sensord
+else
+    echo "sensord_enabled = no" >> "$CONFIG_IN"
+fi
 
 # Now module selection
 # using 'expr match ....' should help a bit
@@ -443,42 +492,42 @@ mkdir $shadowpath/include
 for module in $MOBILITY_MODULES; do
     case "$module" in 
         bearer)
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/bearer
+            $relpath/bin/syncheaders $shadowpath/include/QtmBearer $relpath/src/bearer
             ;;
         publishsubscribe)
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/publishsubscribe
+            $relpath/bin/syncheaders $shadowpath/include/QtmPubSub $relpath/src/publishsubscribe
             ;;
         location)
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/location
+            $relpath/bin/syncheaders $shadowpath/include/QtmLocation $relpath/src/location
             ;;
         serviceframework)
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/serviceframework
+            $relpath/bin/syncheaders $shadowpath/include/QtmServiceFramework $relpath/src/serviceframework
             ;;
         systeminfo)
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/systeminfo
+            $relpath/bin/syncheaders $shadowpath/include/QtmSystemInfo $relpath/src/systeminfo
             ;;
         contacts)
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/contacts
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/contacts/details
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/contacts/requests
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/contacts/filters
+            $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts
+            $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts/details
+            $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts/requests
+            $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts/filters
             ;;
         multimedia)
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/multimedia
+            $relpath/bin/syncheaders $shadowpath/include/QtmMedia $relpath/src/multimedia
             ;;
         messaging)
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/messaging
+            $relpath/bin/syncheaders $shadowpath/include/QtmMessaging $relpath/src/messaging
             ;;
         versit)
             #versit implies contacts
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/versit
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/contacts
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/contacts/details
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/contacts/requests
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/contacts/filters
+            $relpath/bin/syncheaders $shadowpath/include/QtmVersit $relpath/src/versit
+            $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts
+            $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts/details
+            $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts/requests
+            $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts/filters
             ;;
         sensors)
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/sensors
+            $relpath/bin/syncheaders $shadowpath/include/QtmSensors $relpath/src/sensors
             ;;
         gallery)
             $relpath/bin/syncheaders $shadowpath/include $relpath/src/gallery
@@ -496,7 +545,7 @@ if [ "$shadowpath" != "$relpath" ]; then
 fi
 
 echo "Running qmake..."
-if qmake -recursive "$relpath/qtmobility.pro"; then
+if qmake -makefile $QMKSPEC -recursive "$relpath/qtmobility.pro"; then
     echo ""
     echo "configure has finished. You may run make or gmake to build the project now."
 else