delta/qt5/qtlocation.git - code.qt.io: qt/qtlocation.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	use centralized qml plugin project handling	Oswald Buddenhagen	2012-07-11	1	-0/+1
\| \| \| \| \|	Change-Id: Ibe9b056e783f78d2cb2622a174619e4cf36372af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
*	Adjusted gitignore to ignore .directory (added by dolphin filemanager)	Thomas Lowe	2012-04-12	1	-0/+1
\| \| \| \| \|	Change-Id: Ib4c63c3ce68aeb0c7b343c78901fa40ae88c75d1 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
*	Merge remote branch 'origin/master' into places	Aaron McCarthy	2011-08-31	1	-2/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/declarative/flickr/qmllocationflickr.cpp examples/declarative/landmarkmap/landmarkmap.pro examples/declarative/landmarkmap/qmllandmarkmap.cpp examples/declarative/mapviewer/Dialog.qml examples/declarative/mapviewer/MapComponent.qml examples/declarative/mapviewer/Marker.qml examples/declarative/mapviewer/Message.qml examples/declarative/mapviewer/RouteDialog.qml examples/declarative/mapviewer/TextWithLabel.qml examples/declarative/mapviewer/common/Button.qml examples/declarative/mapviewer/common/Fader.qml examples/declarative/mapviewer/common/Menu.qml examples/declarative/mapviewer/common/Slider.qml examples/declarative/mapviewer/common/TitleBar.qml examples/declarative/mapviewer/mapviewer.qml examples/declarative/mapviewer/qmlmapviewer.cpp src/imports/location/qdeclarativegeocodemodel.cpp src/imports/location/qdeclarativegeomapmousearea_p.h src/imports/location/qdeclarativegeomapobject_p.h src/imports/location/qdeclarativegeoserviceprovider.cpp src/imports/location/qdeclarativegeoserviceprovider_p.h src/imports/location/qdeclarativegraphicsgeomap.cpp src/imports/location/qdeclarativegraphicsgeomap_p.h Change-Id: Ic4643a2eabe1d8d4312856422cc0dbe8082c0f16
\| *	Remove obsolete testlib files from .gitignore	Jason McDonald	2011-08-23	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Iae2982286669723a82061741844a9866ca3365f1 Reviewed-on: http://codereview.qt.nokia.com/3372 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* \|	Remove dangerous ignore rules.	Aaron McCarthy	2011-08-10	1	-19/+0
\|/ \| \| \| \| \| \| \| \| \| \|	The wildcard usage in these ignore rules are too vague and can potentially match source files. More specific rules should be added if required. Change-Id: I703bb5dd1475bdf93b7680a2819275a7a769a98c Reviewed-on: http://codereview.qt.nokia.com/2806 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
*	fix incorrect .gitignore	Alex	2011-05-20	1	-0/+3
\| \| \| \| \|	An incorrect .gitignore file caused demo and examples from being properly committed.
*	Add QTLOCATION_VERSION macro for qtlocation	Liang Qi	2011-05-11	1	-0/+2
\| \| \| \| \| \| \|	Provide version info for each library. Task-number: QTMODULARIZATION-44 Reviewed-by: axis
*	Add Qt's .gitignore	Alex	2011-05-10	1	-0/+261