diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-12-20 13:47:58 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-28 01:25:59 +0100 |
| commit | 7803555bc0ffb2ab4ef6809aad24e24f8f8871fb (patch) | |
| tree | ccce0c25bb3c21405d67de95f5ca1e363477d927 /demos | |
| parent | 1534e4cccdf342fb23610002bf42fe615ab3c1f4 (diff) | |
| download | qtdoc-7803555bc0ffb2ab4ef6809aad24e24f8f8871fb.tar.gz | |
Rename trolltech-logo.png.
This file contains a Qt logo, not a Trolltech logo.
Task-number: QTBUG-19653
Change-Id: I7beb2b809fc2062d9cbc1ebfd1961b3ad07ce698
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/qtdemo/images/qtlogo_large.png (renamed from demos/qtdemo/images/trolltech-logo.png) | bin | 23547 -> 23547 bytes | |||
| -rw-r--r-- | demos/qtdemo/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | demos/qtdemo/qtdemo.qrc | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/demos/qtdemo/images/trolltech-logo.png b/demos/qtdemo/images/qtlogo_large.png Binary files differindex 186c69c7..186c69c7 100644 --- a/demos/qtdemo/images/trolltech-logo.png +++ b/demos/qtdemo/images/qtlogo_large.png diff --git a/demos/qtdemo/mainwindow.cpp b/demos/qtdemo/mainwindow.cpp index ffbfd182..8ad4d594 100644 --- a/demos/qtdemo/mainwindow.cpp +++ b/demos/qtdemo/mainwindow.cpp @@ -272,7 +272,7 @@ void MainWindow::setupSceneItems() 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->companyLogo = new ImageItem(QImage(":/images/qtlogo_large.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); diff --git a/demos/qtdemo/qtdemo.qrc b/demos/qtdemo/qtdemo.qrc index c18420f2..b6da367e 100644 --- a/demos/qtdemo/qtdemo.qrc +++ b/demos/qtdemo/qtdemo.qrc @@ -2,7 +2,7 @@ <qresource prefix="/"> <file>xml/examples.xml</file> <file>images/qtlogo_small.png</file> - <file>images/trolltech-logo.png</file> + <file>images/qtlogo_large.png</file> <file>images/demobg.png</file> </qresource> <qresource prefix="/qml" lang="qml"> |
