38 files changed, 18 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore
index ba9e2d85..a71a22fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,7 +44,7 @@ qrc_*.cpp
 doc/src/snippets/cpp/cppsnippet
 doc/src/snippets/places/placescppsnippet
 examples/location/places_list/places_list
-examples/positioning/flickr/qml_position_flickr
+examples/positioning/geoflickr/geoflickr
 examples/location/places_map/places_map
 examples/positioning/logfilepositionsource/logfilepositionsource
 examples/positioning/weatherinfo/weatherinfo
diff --git a/examples/positioning/flickr/flickr-90.qml b/examples/positioning/geoflickr/flickr-90.qml
index 24e61c04..24e61c04 100644
--- a/examples/positioning/flickr/flickr-90.qml
+++ b/examples/positioning/geoflickr/flickr-90.qml
diff --git a/examples/positioning/flickr/flickr.qml b/examples/positioning/geoflickr/flickr.qml
index 0960b4c9..0960b4c9 100644
--- a/examples/positioning/flickr/flickr.qml
+++ b/examples/positioning/geoflickr/flickr.qml
diff --git a/examples/positioning/flickr/flickr.qrc b/examples/positioning/geoflickr/flickr.qrc
index 1019f7d8..1019f7d8 100644
--- a/examples/positioning/flickr/flickr.qrc
+++ b/examples/positioning/geoflickr/flickr.qrc
diff --git a/examples/positioning/flickr/flickrcommon/Progress.qml b/examples/positioning/geoflickr/flickrcommon/Progress.qml
index 33dfadf7..33dfadf7 100644
--- a/examples/positioning/flickr/flickrcommon/Progress.qml
+++ b/examples/positioning/geoflickr/flickrcommon/Progress.qml
diff --git a/examples/positioning/flickr/flickrcommon/RestModel.qml b/examples/positioning/geoflickr/flickrcommon/RestModel.qml
index 26bdf1e4..26bdf1e4 100644
--- a/examples/positioning/flickr/flickrcommon/RestModel.qml
+++ b/examples/positioning/geoflickr/flickrcommon/RestModel.qml
diff --git a/examples/positioning/flickr/flickrcommon/ScrollBar.qml b/examples/positioning/geoflickr/flickrcommon/ScrollBar.qml
index fd67f557..fd67f557 100644
--- a/examples/positioning/flickr/flickrcommon/ScrollBar.qml
+++ b/examples/positioning/geoflickr/flickrcommon/ScrollBar.qml
diff --git a/examples/positioning/flickr/flickrcommon/Slider.qml b/examples/positioning/geoflickr/flickrcommon/Slider.qml
index f01ed53a..f01ed53a 100644
--- a/examples/positioning/flickr/flickrcommon/Slider.qml
+++ b/examples/positioning/geoflickr/flickrcommon/Slider.qml
diff --git a/examples/positioning/flickr/flickrmobile/Button.qml b/examples/positioning/geoflickr/flickrmobile/Button.qml
index c24877ea..c24877ea 100644
--- a/examples/positioning/flickr/flickrmobile/Button.qml
+++ b/examples/positioning/geoflickr/flickrmobile/Button.qml
diff --git a/examples/positioning/flickr/flickrmobile/GeoTab.qml b/examples/positioning/geoflickr/flickrmobile/GeoTab.qml
index 53066190..53066190 100644
--- a/examples/positioning/flickr/flickrmobile/GeoTab.qml
+++ b/examples/positioning/geoflickr/flickrmobile/GeoTab.qml
diff --git a/examples/positioning/flickr/flickrmobile/GridDelegate.qml b/examples/positioning/geoflickr/flickrmobile/GridDelegate.qml
index 54f6b0eb..54f6b0eb 100644
--- a/examples/positioning/flickr/flickrmobile/GridDelegate.qml
+++ b/examples/positioning/geoflickr/flickrmobile/GridDelegate.qml
diff --git a/examples/positioning/flickr/flickrmobile/ImageDetails.qml b/examples/positioning/geoflickr/flickrmobile/ImageDetails.qml
index a06d66a5..a06d66a5 100644
--- a/examples/positioning/flickr/flickrmobile/ImageDetails.qml
+++ b/examples/positioning/geoflickr/flickrmobile/ImageDetails.qml
diff --git a/examples/positioning/flickr/flickrmobile/ListDelegate.qml b/examples/positioning/geoflickr/flickrmobile/ListDelegate.qml
index baec7205..baec7205 100644
--- a/examples/positioning/flickr/flickrmobile/ListDelegate.qml
+++ b/examples/positioning/geoflickr/flickrmobile/ListDelegate.qml
diff --git a/examples/positioning/flickr/flickrmobile/TitleBar.qml b/examples/positioning/geoflickr/flickrmobile/TitleBar.qml
index f304d88f..4ebc438e 100644
--- a/examples/positioning/flickr/flickrmobile/TitleBar.qml
+++ b/examples/positioning/geoflickr/flickrmobile/TitleBar.qml
@@ -66,7 +66,7 @@ Item {
                 verticalCenter: parent.verticalCenter
             }
             elide: Text.ElideLeft
-            text: "Declarative location Flickr"
+            text: "GeoFlickr (QML)"
             font.bold: true; color: "White"; style: Text.Raised; styleColor: "Black"
         }
     }
diff --git a/examples/positioning/flickr/flickrmobile/ToolBar.qml b/examples/positioning/geoflickr/flickrmobile/ToolBar.qml
index bdc53ef7..bdc53ef7 100644
--- a/examples/positioning/flickr/flickrmobile/ToolBar.qml
+++ b/examples/positioning/geoflickr/flickrmobile/ToolBar.qml
diff --git a/examples/positioning/flickr/flickrmobile/images/gloss.png b/examples/positioning/geoflickr/flickrmobile/images/gloss.png
index 5d370cd9..5d370cd9 100644
--- a/examples/positioning/flickr/flickrmobile/images/gloss.png
+++ b/examples/positioning/geoflickr/flickrmobile/images/gloss.png
diff --git a/examples/positioning/flickr/flickrmobile/images/lineedit.png b/examples/positioning/geoflickr/flickrmobile/images/lineedit.png
index 2cc38dc3..2cc38dc3 100644
--- a/examples/positioning/flickr/flickrmobile/images/lineedit.png
+++ b/examples/positioning/geoflickr/flickrmobile/images/lineedit.png
diff --git a/examples/positioning/flickr/flickrmobile/images/lineedit.sci b/examples/positioning/geoflickr/flickrmobile/images/lineedit.sci
index 054bff78..054bff78 100644
--- a/examples/positioning/flickr/flickrmobile/images/lineedit.sci
+++ b/examples/positioning/geoflickr/flickrmobile/images/lineedit.sci
diff --git a/examples/positioning/flickr/flickrmobile/images/moon.png b/examples/positioning/geoflickr/flickrmobile/images/moon.png
index 9407b2b4..9407b2b4 100644
--- a/examples/positioning/flickr/flickrmobile/images/moon.png
+++ b/examples/positioning/geoflickr/flickrmobile/images/moon.png
diff --git a/examples/positioning/flickr/flickrmobile/images/quit.png b/examples/positioning/geoflickr/flickrmobile/images/quit.png
index 5bda1b6e..5bda1b6e 100644
--- a/examples/positioning/flickr/flickrmobile/images/quit.png
+++ b/examples/positioning/geoflickr/flickrmobile/images/quit.png
diff --git a/examples/positioning/flickr/flickrmobile/images/star.png b/examples/positioning/geoflickr/flickrmobile/images/star.png
index 27ef9242..27ef9242 100644
--- a/examples/positioning/flickr/flickrmobile/images/star.png
+++ b/examples/positioning/geoflickr/flickrmobile/images/star.png
diff --git a/examples/positioning/flickr/flickrmobile/images/stripes.png b/examples/positioning/geoflickr/flickrmobile/images/stripes.png
index 9f36727e..9f36727e 100644
--- a/examples/positioning/flickr/flickrmobile/images/stripes.png
+++ b/examples/positioning/geoflickr/flickrmobile/images/stripes.png
diff --git a/examples/positioning/flickr/flickrmobile/images/sun.png b/examples/positioning/geoflickr/flickrmobile/images/sun.png
index 7713ca5c..7713ca5c 100644
--- a/examples/positioning/flickr/flickrmobile/images/sun.png
+++ b/examples/positioning/geoflickr/flickrmobile/images/sun.png
diff --git a/examples/positioning/flickr/flickrmobile/images/titlebar.png b/examples/positioning/geoflickr/flickrmobile/images/titlebar.png
index 51c90082..51c90082 100644
--- a/examples/positioning/flickr/flickrmobile/images/titlebar.png
+++ b/examples/positioning/geoflickr/flickrmobile/images/titlebar.png
diff --git a/examples/positioning/flickr/flickrmobile/images/titlebar.sci b/examples/positioning/geoflickr/flickrmobile/images/titlebar.sci
index 0418d94c..0418d94c 100644
--- a/examples/positioning/flickr/flickrmobile/images/titlebar.sci
+++ b/examples/positioning/geoflickr/flickrmobile/images/titlebar.sci
diff --git a/examples/positioning/flickr/flickrmobile/images/toolbutton.png b/examples/positioning/geoflickr/flickrmobile/images/toolbutton.png
index 11310013..11310013 100644
--- a/examples/positioning/flickr/flickrmobile/images/toolbutton.png
+++ b/examples/positioning/geoflickr/flickrmobile/images/toolbutton.png
diff --git a/examples/positioning/flickr/flickrmobile/images/toolbutton.sci b/examples/positioning/geoflickr/flickrmobile/images/toolbutton.sci
index 9e4f9653..9e4f9653 100644
--- a/examples/positioning/flickr/flickrmobile/images/toolbutton.sci
+++ b/examples/positioning/geoflickr/flickrmobile/images/toolbutton.sci
diff --git a/examples/positioning/flickr/flickrmobile/nmealog.txt b/examples/positioning/geoflickr/flickrmobile/nmealog.txt
index 8c8286dd..8c8286dd 100644
--- a/examples/positioning/flickr/flickrmobile/nmealog.txt
+++ b/examples/positioning/geoflickr/flickrmobile/nmealog.txt
diff --git a/examples/positioning/flickr/flickr.pro b/examples/positioning/geoflickr/geoflickr.pro
index 1d7cce50..97e8b57f 100644
--- a/examples/positioning/flickr/flickr.pro
+++ b/examples/positioning/geoflickr/geoflickr.pro
@@ -1,5 +1,5 @@
-TEMPLATE=app
-TARGET = qml_position_flickr
+TEMPLATE = app
+TARGET = geoflickr
 
 QT += qml quick network positioning
 SOURCES += qmllocationflickr.cpp
diff --git a/examples/positioning/flickr/flickr.qmlproject b/examples/positioning/geoflickr/geoflickr.qmlproject
index d4909f86..d4909f86 100644
--- a/examples/positioning/flickr/flickr.qmlproject
+++ b/examples/positioning/geoflickr/geoflickr.qmlproject
diff --git a/examples/positioning/flickr/qmllocationflickr.cpp b/examples/positioning/geoflickr/qmllocationflickr.cpp
index 6ecd727a..6ecd727a 100644
--- a/examples/positioning/flickr/qmllocationflickr.cpp
+++ b/examples/positioning/geoflickr/qmllocationflickr.cpp
diff --git a/examples/positioning/positioning.pro b/examples/positioning/positioning.pro
index 2f40d326..0e436b46 100644
--- a/examples/positioning/positioning.pro
+++ b/examples/positioning/positioning.pro
@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
 
 qtHaveModule(widgets): SUBDIRS += logfilepositionsource
-qtHaveModule(quick): SUBDIRS += flickr weatherinfo satelliteinfo
+qtHaveModule(quick): SUBDIRS += geoflickr weatherinfo satelliteinfo
diff --git a/src/imports/positioning/qdeclarativeposition.cpp b/src/imports/positioning/qdeclarativeposition.cpp
index 04b42cbc..ee971c01 100644
--- a/src/imports/positioning/qdeclarativeposition.cpp
+++ b/src/imports/positioning/qdeclarativeposition.cpp
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
     \section2 Example Usage
 
     See the example given for the \l{PositionSource} type, or the
-    \l{flickr}{Flickr} example application.
+    \l{geoflickr}{GeoFlickr} example application.
 
     \sa PositionSource, coordinate
 */
diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp
index a770e664..b688758a 100644
--- a/src/imports/positioning/qdeclarativepositionsource.cpp
+++ b/src/imports/positioning/qdeclarativepositionsource.cpp
@@ -99,7 +99,7 @@ QT_BEGIN_NAMESPACE
     }
     \endcode
 
-    The \l{flickr}{Flickr} example application shows how to use
+    The \l{geoflickr}{GeoFlickr} example application shows how to use
     a PositionSource in your application to retrieve local data for users
     from a REST web service.
 
diff --git a/src/positioning/doc/images/qml-flickr-1.jpg b/src/positioning/doc/images/qml-flickr-1.jpg
index 14fc5c92..42514ff0 100644
--- a/src/positioning/doc/images/qml-flickr-1.jpg
+++ b/src/positioning/doc/images/qml-flickr-1.jpg
diff --git a/src/positioning/doc/src/examples/declarative-flickr.qdoc b/src/positioning/doc/src/examples/geoflickr.qdoc
index a1d0bb58..af47461b 100644
--- a/src/positioning/doc/src/examples/declarative-flickr.qdoc
+++ b/src/positioning/doc/src/examples/geoflickr.qdoc
@@ -26,11 +26,11 @@
 ****************************************************************************/
 
 /*!
-    \example flickr
-    \title Flickr (QML)
+    \example geoflickr
+    \title GeoFlickr (QML)
     \ingroup qtpositioning-examples
 
-    \brief The Flickr example shows how to use the user's current position to
+    \brief The GeoFlickr example shows how to use the user's current position to
            fetch local content from a web service.
 
     This is a small example, illustrating one of the very core parts of the
@@ -54,20 +54,20 @@
     GeoTab component (the floating "window" describing current position and
     status).
 
-    \snippet flickr/flickrmobile/GeoTab.qml possrc
+    \snippet geoflickr/flickrmobile/GeoTab.qml possrc
 
     When the "Locate and update" button is pressed, we first interrogate the
     PositionSource to check if it has an available backend for positioning
     data. If it does not, we fall back to using a pre-recorded NMEA log
     for demonstration. We then instruct the PositionSource to update.
 
-    \snippet flickr/flickrmobile/GeoTab.qml locatebutton-top
-    \snippet flickr/flickrmobile/GeoTab.qml locatebutton-clicked
+    \snippet geoflickr/flickrmobile/GeoTab.qml locatebutton-top
+    \snippet geoflickr/flickrmobile/GeoTab.qml locatebutton-clicked
 
     To share the new position data with the rest of the application, we use
     properties that we have created on the GeoTab component:
 
-    \snippet flickr/flickrmobile/GeoTab.qml props
+    \snippet geoflickr/flickrmobile/GeoTab.qml props
 
     \section1 Using the Current Position
 
@@ -79,7 +79,7 @@
     In this case, it retrieves data from the Flickr REST API online, based on
     our current position
 
-    \snippet flickr/flickrcommon/RestModel.qml restmodel
+    \snippet geoflickr/flickrcommon/RestModel.qml restmodel
 
     This model data is then shown in a variety of Qt Quick views to produce
     the example application.
diff --git a/src/positioning/doc/src/qml-position.qdoc b/src/positioning/doc/src/qml-position.qdoc
index 3ccac326..ec1cf47a 100644
--- a/src/positioning/doc/src/qml-position.qdoc
+++ b/src/positioning/doc/src/qml-position.qdoc
@@ -111,9 +111,9 @@ PositionSource {
 
 
 
-\section2 \b{Flickr Example}
+\section2 \b{GeoFlickr Example}
 
-The \l{Flickr (QML)}{Flickr Example} uses the Location to download thumbnail
+The \l{GeoFlickr (QML)}{GeoFlickr Example} uses the Location to download thumbnail
 images from Flickr relevant to the current location.
 
 */
diff --git a/src/positioning/doc/src/qtpositioning.qdoc b/src/positioning/doc/src/qtpositioning.qdoc
index ae74f89c..5662b0aa 100644
--- a/src/positioning/doc/src/qtpositioning.qdoc
+++ b/src/positioning/doc/src/qtpositioning.qdoc
@@ -114,7 +114,7 @@ such as speed and direction. This provides the fundamental location information
 \section2 Examples
 
 \list
-    \li \l {Flickr (QML)}
+    \li \l {GeoFlickr (QML)}
     \li \l {Log File Position Source (C++)}
     \li \l {SatelliteInfo (C++/QML)}
     \li \l {Weather Info (C++/QML)}