From 642098c893be76ad9c049910661059bb926dc6d6 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Fri, 22 Nov 2013 16:03:16 +1000 Subject: Don't start Geoclue satellite providers until necessary. This builds on 2509cc2f13b15de099c3d68769e9bce869400ef7. It implements similar changes to the Geoclue satellite info source. Change-Id: I657f110e049c84b35f534a3bfffd14d57ee9c37a Reviewed-by: Alex Blasche --- .../qgeosatelliteinfosource_geocluemaster.cpp | 53 ++++++++++++++++++---- .../qgeosatelliteinfosource_geocluemaster.h | 2 + 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp index 6dcedeec..ffa976a8 100644 --- a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp +++ b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp @@ -155,10 +155,10 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, QList &usedPrn, const QList &satInfos); private slots: + void requestUpdateTimeout(); void positionProviderChanged(const QByteArray &service, const QByteArray &path); void satellitesChanged(const QDBusMessage &message); @@ -91,6 +92,7 @@ private: QList m_inUse; Error m_error; bool m_satellitesChangedConnected; + bool m_running; }; QT_END_NAMESPACE -- cgit v1.2.1 From d0e2555346e514003ced23799e27e94295c56677 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 25 Nov 2013 12:47:33 +0100 Subject: Bump MODULE_VERSION to 5.2.1 Change-Id: I73b42c27dfb256818f650d090586fe8bc7db6a2c Reviewed-by: Matti Paaso Reviewed-by: Oswald Buddenhagen Reviewed-by: Alex Blasche --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 2f09a2ba..45d05b25 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.2.0 +MODULE_VERSION = 5.2.1 -- cgit v1.2.1 From 8a908dababc1b505e521ce8f622d0d2814874200 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Mon, 18 Nov 2013 10:40:36 +0100 Subject: Fix cut of string when weather string is longer Task-number: QTBUG-34910 Change-Id: I90a1748496b55b2e69db5c94fa217f79d43c176f Reviewed-by: Jim Ehrismann Reviewed-by: Alex Blasche --- examples/positioning/weatherinfo/components/BigForecastIcon.qml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/positioning/weatherinfo/components/BigForecastIcon.qml b/examples/positioning/weatherinfo/components/BigForecastIcon.qml index 6583d6d3..16e99bf8 100644 --- a/examples/positioning/weatherinfo/components/BigForecastIcon.qml +++ b/examples/positioning/weatherinfo/components/BigForecastIcon.qml @@ -70,7 +70,10 @@ Item { Text { text: current.bottomText - font.pointSize: 28 + font.pointSize: 23 + wrapMode: Text.WordWrap + width: parent.width + horizontalAlignment: Text.AlignRight anchors { bottom: current.bottom right: current.right -- cgit v1.2.1 From be13521707249d4d89085e6e850944056ab923f7 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 28 Nov 2013 14:21:50 +0100 Subject: Fix make install rules for all examples in QtPositioning This was highlighted during the testing of the Qt 5.2.0 package. Change-Id: Iab1e6f5f1e1a8ceb62fc44658ec12fb131ccad65 Reviewed-by: Oswald Buddenhagen Reviewed-by: Alex Blasche --- .qmake.conf | 1 + examples/positioning/flickr/flickr.pro | 11 +++++------ .../logfilepositionsource/logfilepositionsource.pro | 7 +++---- examples/positioning/weatherinfo/weatherinfo.pro | 11 +++++------ 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.qmake.conf b/.qmake.conf index 45d05b25..457f68b5 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,4 @@ load(qt_build_config) +CONFIG += qt_example_installs MODULE_VERSION = 5.2.1 diff --git a/examples/positioning/flickr/flickr.pro b/examples/positioning/flickr/flickr.pro index 9014935d..1d7cce50 100644 --- a/examples/positioning/flickr/flickr.pro +++ b/examples/positioning/flickr/flickr.pro @@ -7,10 +7,9 @@ SOURCES += qmllocationflickr.cpp RESOURCES += \ flickr.qrc -OTHER_FILES += flickr.qml +OTHER_FILES += flickr.qml \ + flickrcommon/* \ + flickrmobile/* -target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/flickr -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.qml flickrcommon flickrmobile -sources.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/flickr - -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/positioning/flickr +INSTALLS += target diff --git a/examples/positioning/logfilepositionsource/logfilepositionsource.pro b/examples/positioning/logfilepositionsource/logfilepositionsource.pro index bd00a169..59c0d86b 100644 --- a/examples/positioning/logfilepositionsource/logfilepositionsource.pro +++ b/examples/positioning/logfilepositionsource/logfilepositionsource.pro @@ -9,8 +9,7 @@ SOURCES = logfilepositionsource.cpp \ clientapplication.cpp \ main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/logfilepositionsource -sources.files = $$SOURCES $$HEADERS *.pro simplelog.txt -sources.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/logfilepositionsource +EXAMPLE_FILES = simplelog.txt -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/positioning/logfilepositionsource +INSTALLS += target diff --git a/examples/positioning/weatherinfo/weatherinfo.pro b/examples/positioning/weatherinfo/weatherinfo.pro index 1470b8a0..e2b2102d 100644 --- a/examples/positioning/weatherinfo/weatherinfo.pro +++ b/examples/positioning/weatherinfo/weatherinfo.pro @@ -9,14 +9,13 @@ SOURCES += main.cpp \ OTHER_FILES += weatherinfo.qml \ components/WeatherIcon.qml \ components/ForecastIcon.qml \ - components/BigForecastIcon.qml + components/BigForecastIcon.qml \ + icons/* + RESOURCES += weatherinfo.qrc HEADERS += appmodel.h -#install -target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/weatherinfo -sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/weatherinfo -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/positioning/weatherinfo +INSTALLS += target -- cgit v1.2.1