diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2010-07-19 05:26:37 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2010-07-19 05:26:37 (GMT) |
commit | 75131b7a1bfeeb033ea5b8bf62d50cc3d82d757e (patch) | |
tree | f674bb8ff88068887605655bc61b2d5a78956c71 /demos/qtdemo/menumanager.cpp | |
parent | 8668f245b69da455ac7fe1d0a599226c1d6b9580 (diff) | |
download | Qt-75131b7a1bfeeb033ea5b8bf62d50cc3d82d757e.zip Qt-75131b7a1bfeeb033ea5b8bf62d50cc3d82d757e.tar.gz Qt-75131b7a1bfeeb033ea5b8bf62d50cc3d82d757e.tar.bz2 |
Remove the -use-blur option from qtdemo
It relied on the now missing pixmap property. Since it isn't used, it
doesn't seem worth the effort to update it to use a declarative image
provider instead.
Diffstat (limited to 'demos/qtdemo/menumanager.cpp')
-rw-r--r-- | demos/qtdemo/menumanager.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp index 15561ab..7168b57 100644 --- a/demos/qtdemo/menumanager.cpp +++ b/demos/qtdemo/menumanager.cpp @@ -378,17 +378,6 @@ void MenuManager::launchQmlExample(const QString &name) return; } } - if(!Colors::noBlur){ - QImage qmlBgImage(this->window->rect().size(), QImage::Format_ARGB32_Premultiplied); - QPainter painter(&qmlBgImage); - if(Colors::showFps) - this->window->fpsLabel->setOpacity(0); - this->window->render(&painter); - if(Colors::showFps) - this->window->fpsLabel->setOpacity(1.0); - Qt::ImageConversionFlags convFlags = Qt::AvoidDither | Qt::NoOpaqueDetection; - this->declarativeEngine->rootContext()->setContextProperty("bgAppPixmap", QVariant(QPixmap::fromImage(qmlBgImage, convFlags))); - } qmlRoot->setProperty("qmlFile", QVariant(""));//unload component qmlRoot->setProperty("show", QVariant(true)); @@ -439,17 +428,8 @@ void MenuManager::init(MainWindow *window) } // Create QML Loader - qmlRegisterType<QGraphicsBlurEffect>("Effects", 1, 0, "Blur"); - qmlRegisterType<QGraphicsDropShadowEffect>("Effects", 1, 0, "DropShadow"); declarativeEngine = new QDeclarativeEngine(this); - // Note that we paint the background into a static image for a theorized performance improvement when blurring - // It has not yet been determined what, if any, speed up this gives (but is left in 'cause the QML expects it now) - declarativeEngine->rootContext()->setContextProperty("useBlur", !Colors::noBlur); - QImage qmlBgImage(this->window->rect().size(), QImage::Format_ARGB32_Premultiplied); - qmlBgImage.fill(0); - this->declarativeEngine->rootContext()->setContextProperty("bgAppPixmap", QVariant(QPixmap::fromImage(qmlBgImage))); - QDeclarativeComponent component(declarativeEngine, QUrl("qrc:qml/qmlShell.qml"), this); qmlRoot = 0; if(component.isReady()) |