diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-16 14:56:31 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-18 11:46:11 +0200 |
| commit | 43a615e309e70978711f5c2c56a9881876b96349 (patch) | |
| tree | a8d0899cbc1e7775f52056fc56db58b2fcf305de /examples | |
| parent | 6034d89bdd907d4795c19e8ac752f4eb51c82a94 (diff) | |
| parent | 3513995d8fde7f002977275463fcea1b86f4a693 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/qml/compiler/qqmltypecompiler.cpp
src/qml/jsruntime/qv4qmlcontext.cpp
src/qml/jsruntime/qv4qobjectwrapper.cpp
src/qml/qml/qqmlcustomparser.cpp
src/qml/qml/qqmlimport.cpp
src/qml/qml/qqmlimport_p.h
src/qml/qml/qqmlmetatype.cpp
src/qml/qml/qqmlmetatype_p.h
src/qml/qml/qqmltypenamecache.cpp
src/qml/qml/qqmltypenamecache_p.h
src/qml/qml/qqmltypewrapper.cpp
src/qml/qml/qqmltypewrapper_p.h
src/qml/qml/qqmlvmemetaobject.cpp
src/qml/util/qqmladaptormodel.cpp
Change-Id: Ic959d03e6f9c328fb02710d9abbb0f27cddde131
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/demos/maroon/content/SoundEffect.qml | 2 | ||||
| -rw-r--r-- | examples/quick/scenegraph/sgengine/window.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/quick/demos/maroon/content/SoundEffect.qml b/examples/quick/demos/maroon/content/SoundEffect.qml index 136b33aa9b..4b723170a0 100644 --- a/examples/quick/demos/maroon/content/SoundEffect.qml +++ b/examples/quick/demos/maroon/content/SoundEffect.qml @@ -42,7 +42,7 @@ import QtQuick 2.0 //Proxies a SoundEffect if QtMultimedia is installed Item { id: container - property QtObject effect: Qt.createQmlObject("import QtMultimedia 5.0; SoundEffect{ source: '" + container.source + "'; muted: !Qt.application.active }", container); + property QtObject effect: Qt.createQmlObject("import QtMultimedia 5.0; SoundEffect{ source: '" + container.source + "'; muted: Qt.application.state != Qt.ApplicationActive }", container); property url source: "" onSourceChanged: if (effect != null) effect.source = source; function play() { diff --git a/examples/quick/scenegraph/sgengine/window.cpp b/examples/quick/scenegraph/sgengine/window.cpp index 759bbf1fcd..a73d9bf755 100644 --- a/examples/quick/scenegraph/sgengine/window.cpp +++ b/examples/quick/scenegraph/sgengine/window.cpp @@ -173,7 +173,7 @@ void Window::addItems() QSGTexture *tex = textures[i%2]; QPointF fromPos(-tex->textureSize().width(), qrand() / float(RAND_MAX) * (height() - tex->textureSize().height())); QPointF toPos(width(), qrand() / float(RAND_MAX) * height() * 1.5 - height() * 0.25); - m_items.append(QSharedPointer<Item>(new Item(m_sgRootNode.data(), tex, fromPos, toPos))); + m_items.append(QSharedPointer<Item>::create(m_sgRootNode.data(), tex, fromPos, toPos)); } update(); } |