Merge commit 'origin/4.5'

Conflicts:
	demos/boxes/glshaders.cpp
	src/gui/graphicsview/qgraphicsitem.cpp
	tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
	tools/linguist/shared/cpp.cpp
	translations/linguist_ja.qm
	translations/qt_ru.qm

2 files changed, 5 insertions, 6 deletions

diff --git a/examples/xmlpatterns/trafficinfo/mainwindow.cpp b/examples/xmlpatterns/trafficinfo/mainwindow.cpp
index aeb7224..a6628df 100644
--- a/examples/xmlpatterns/trafficinfo/mainwindow.cpp
+++ b/examples/xmlpatterns/trafficinfo/mainwindow.cpp
@@ -69,16 +69,15 @@ MainWindow::MainWindow()
 
     setWindowTitle(tr("Traffic Info Oslo"));
 
-    QTimer *timer = new QTimer(this);
-    connect(timer, SIGNAL(timeout()), this, SLOT(updateTimeInformation()));
-    timer->start(1000*60*5);
-
     const QSettings settings("Qt Software", "trafficinfo");
     m_station = StationInformation(settings.value("stationId", "03012130").toString(),
                                    settings.value("stationName", "Nydalen [T-bane] (OSL)").toString());
     m_lines = settings.value("lines", QStringList()).toStringList();
 
-    updateTimeInformation();
+    QTimer *timer = new QTimer(this);
+    connect(timer, SIGNAL(timeout()), this, SLOT(updateTimeInformation()));
+    timer->start(1000*60*5);
+    QMetaObject::invokeMethod(this, SLOT(updateTimeInformation()), Qt::QueuedConnection);
 }
 
 MainWindow::~MainWindow()
diff --git a/examples/xmlpatterns/trafficinfo/stationdialog.cpp b/examples/xmlpatterns/trafficinfo/stationdialog.cpp
index 54ed904..6c3846b 100644
--- a/examples/xmlpatterns/trafficinfo/stationdialog.cpp
+++ b/examples/xmlpatterns/trafficinfo/stationdialog.cpp
@@ -125,7 +125,7 @@ StationDialog::StationDialog(const QString &name, const QStringList &lineNumbers
             m_ui.m_line4->setText(lineNumbers.at(i));
     }
 
-    searchStations();
+    QMetaObject::invokeMethod(this, SLOT(searchStations()), Qt::QueuedConnection);
 }
 
 StationInformation StationDialog::selectedStation() const