Changeset 846 for trunk/demos/qtdemo/mainwindow.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/qtdemo/mainwindow.cpp (modified) (5 diffs)

trunk/demos/qtdemo/mainwindow.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -267 +267 @@
     if (Colors::showFps){
         this->fpsLabel = new DemoTextItem(QString("FPS: --"), Colors::buttonFont(), Qt::white, -1, this->scene, 0, DemoTextItem::DYNAMIC_TEXT);
-        this->fpsLabel->setZValue(100);
+        this->fpsLabel->setZValue(100);
         this->fpsLabel->setPos(Colors::stageStartX, 600 - QFontMetricsF(Colors::buttonFont()).height() - 5);
     }
 
-    this->companyLogo = new ImageItem(QImage(":/images/trolltech-logo.png"), 1000, 1000, this->scene, 0, true, 0.5f);
-    this->qtLogo = new ImageItem(QImage(":/images/qtlogo_small.png"), 1000, 1000, this->scene, 0, true, 0.5f);
+    this->mainSceneRoot = new QGraphicsWidget();
+    this->scene->addItem(mainSceneRoot);
+    this->companyLogo = new ImageItem(QImage(":/images/trolltech-logo.png"), 1000, 1000, this->scene, mainSceneRoot, true, 0.5f);
+    this->qtLogo = new ImageItem(QImage(":/images/qtlogo_small.png"), 1000, 1000, this->scene, mainSceneRoot, true, 0.5f);
     this->companyLogo->setZValue(100);
     this->qtLogo->setZValue(100);
@@ -377 +379 @@
         QApplication::quit();
     }
-    else if (event->key() == Qt::Key_1){
+    else if (event->key() == Qt::Key_1){
             QString s("");
             s += "Rendering system: ";
@@ -387 +389 @@
             s += "\nAdapt: ";
             s += Colors::noAdapt ? "off" : "on";
-            s += "\nAdaption occured: ";
+            s += "\nAdaption occured: ";
             s += Colors::adapted ? "yes" : "no";
             s += "\nOpenGL version: ";
@@ -416 +418 @@
             QMessageBox::information(0, QString("Current configuration"), s);
     }
+
 }