Merge lp:~thomas-voss/qtubuntu-sensors/bump-default-timeout into lp:qtubuntu-sensors

[Thomas Voß]

Bump timeout to 60 seconds.

Bump timeout to 60 seconds.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:76
http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-utopic-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-utopic-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-utopic-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-utopic-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-sensors-ci/61/rebuild

review: Approve (continuous-integration)

Unmerged revisions

76. By Thomas Voß on 2014-10-08

Bump timeout to 60 seconds.

=== modified file 'plugins/position/core_geo_position_info_source.cpp'
--- plugins/position/core_geo_position_info_source.cpp	2014-09-23 16:17:57 +0000
+++ plugins/position/core_geo_position_info_source.cpp	2014-10-08 13:35:31 +0000
@@ -33,8 +33,8 @@
 {
     // If an application requests an individual position update with a
     // timeout value of 0, we bump the timeout to the default value of
-    // 10 seconds.
-    static const unsigned int default_timeout_in_ms = 10 * 1000;
+    // 60 seconds.
+    static const unsigned int default_timeout_in_ms = 60 * 1000;
 
     // Our session flags for connecting to the backend service.
     static const unsigned int empty_creation_flags = 0;