aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-02-29 17:40:39 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-20 05:37:59 +0100
commit8e8738df1454434a3e2b77f65564ffa148d22a2c (patch)
tree3d757cf5822ff65fec93879f0514fef52a39acc2 /examples/quick
parent6051714b12b2c633a8f2800c96c98cef59d4fea1 (diff)
Update Squircle example towards new guidelines
Doesn't work properly though. QTBUG-24566 filed for that. Change-Id: I31a8184456add6060e65bf11323153dc7a80b306 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'examples/quick')
-rw-r--r--examples/quick/openglunderqml/main.cpp2
-rw-r--r--examples/quick/openglunderqml/main.qml7
2 files changed, 6 insertions, 3 deletions
diff --git a/examples/quick/openglunderqml/main.cpp b/examples/quick/openglunderqml/main.cpp
index 3b682deaec..8d1a91bdb2 100644
--- a/examples/quick/openglunderqml/main.cpp
+++ b/examples/quick/openglunderqml/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
{
QGuiApplication app(argc, argv);
- qmlRegisterType<Squircle>("QtQuick", 2, 0, "Squircle");
+ qmlRegisterType<Squircle>("OpenGLUnderQML", 2, 0, "Squircle");
QQuickView view;
view.setSource(QUrl("main.qml"));
diff --git a/examples/quick/openglunderqml/main.qml b/examples/quick/openglunderqml/main.qml
index 1485cbbdb8..174bb262ca 100644
--- a/examples/quick/openglunderqml/main.qml
+++ b/examples/quick/openglunderqml/main.qml
@@ -40,13 +40,16 @@
****************************************************************************/
import QtQuick 2.0
+import OpenGLUnderQML 2.0
Item {
- width: 400
- height: 300
+ width: 320
+ height: 480
Squircle {
+ width: 320
+ height: 320
SequentialAnimation on t {
NumberAnimation { to: 1; duration: 2500; easing.type: Easing.InQuad }
NumberAnimation { to: 0; duration: 2500; easing.type: Easing.OutQuad }