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

5 files changed, 14 insertions, 6 deletions

diff --git a/demos/browser/browser.pro b/demos/browser/browser.pro
index d970f99..13e8a1d 100644
--- a/demos/browser/browser.pro
+++ b/demos/browser/browser.pro
@@ -86,6 +86,6 @@ wince*: {
 
 # install
 target.path = $$[QT_INSTALL_DEMOS]/browser
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.plist *.icns *.ico *.rc *.pro *.html *.doc images htmls
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.plist *.icns *.ico *.rc *.pro *.html *.doc images htmls data
 sources.path = $$[QT_INSTALL_DEMOS]/browser
 INSTALLS += target sources
diff --git a/demos/qtdemo/colors.cpp b/demos/qtdemo/colors.cpp
index b82de2f..eaef058 100644
--- a/demos/qtdemo/colors.cpp
+++ b/demos/qtdemo/colors.cpp
@@ -328,7 +328,7 @@ void Colors::detectSystemResources()
 #if defined(Q_WS_X11)
     // check if X render is present:
     QPixmap tmp(1, 1);
-    if (!tmp.x11PictureHandle()){
+    if (!tmp.x11PictureHandle() && tmp.paintEngine()->type() == QPaintEngine::X11){
         Colors::xRenderPresent = false;
         if (Colors::verbose)
             qDebug("- X render not present");
diff --git a/demos/qtdemo/mainwindow.cpp b/demos/qtdemo/mainwindow.cpp
index 858d389..6207607 100644
--- a/demos/qtdemo/mainwindow.cpp
+++ b/demos/qtdemo/mainwindow.cpp
@@ -185,6 +185,7 @@ void MainWindow::switchTimerOnOff(bool on)
 
     if (on && !Colors::noTimerUpdate){
         this->useTimer = true;
+        this->setViewportUpdateMode(QGraphicsView::NoViewportUpdate);
         this->fpsTime = QTime::currentTime();
         this->updateTimer.start(int(1000 / Colors::fps));
     }
@@ -256,6 +257,7 @@ void MainWindow::tick()
     if (MenuManager::instance()->ticker)
         MenuManager::instance()->ticker->tick();
 
+    this->viewport()->update();
     if (this->useTimer)
         this->updateTimer.start(int(1000 / Colors::fps));
 }
@@ -423,7 +425,9 @@ void MainWindow::focusInEvent(QFocusEvent *)
     if (MenuManager::instance()->ticker)
         MenuManager::instance()->ticker->pause(false);
 
-    this->switchTimerOnOff(true);
+    int code = MenuManager::instance()->currentMenuCode;
+    if (code == MenuManager::ROOT || code == MenuManager::MENU1)
+        this->switchTimerOnOff(true);
 
     this->pausedLabel->setRecursiveVisible(false);
 }
@@ -436,7 +440,9 @@ void MainWindow::focusOutEvent(QFocusEvent *)
     if (MenuManager::instance()->ticker)
         MenuManager::instance()->ticker->pause(true);
 
-    this->switchTimerOnOff(false);
+    int code = MenuManager::instance()->currentMenuCode;
+    if (code == MenuManager::ROOT || code == MenuManager::MENU1)
+        this->switchTimerOnOff(false);
 
     this->pausedLabel->setRecursiveVisible(true);
 }
diff --git a/demos/qtdemo/qtdemo.pro b/demos/qtdemo/qtdemo.pro
index 2534b75..163ed17 100644
--- a/demos/qtdemo/qtdemo.pro
+++ b/demos/qtdemo/qtdemo.pro
@@ -1,6 +1,8 @@
 CONFIG += assistant help x11inc
 TARGET = qtdemo
-DESTDIR = $$QT_BUILD_TREE/bin
+DEMO_DESTDIR = $$QT_BUILD_TREE
+isEmpty(DEMO_DESTDIR):DEMO_DESTDIR=../..
+DESTDIR = $$DEMO_DESTDIR/bin
 OBJECTS_DIR = .obj
 MOC_DIR = .moc
 INSTALLS += target sources
diff --git a/demos/spreadsheet/spreadsheet.pro b/demos/spreadsheet/spreadsheet.pro
index b62f244..6ed0016 100644
--- a/demos/spreadsheet/spreadsheet.pro
+++ b/demos/spreadsheet/spreadsheet.pro
@@ -27,7 +27,7 @@ build_all:!build_pass {
 
 # install
 target.path = $$[QT_INSTALL_DEMOS]/spreadsheet
-sources.files = $$SOURCES $$RESOURCES *.pro images
+sources.files = $$SOURCES $$RESOURCES *.pro images $$HEADERS
 sources.path = $$[QT_INSTALL_DEMOS]/spreadsheet
 INSTALLS += target sources