| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| |
| | |
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>
|
| |/
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
| |
An incorrect .gitignore file caused demo and examples from being
properly committed.
|
| |
|
|
|
|
|
| |
Provide version info for each library.
Task-number: QTMODULARIZATION-44
Reviewed-by: axis
|
| |
|
