diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-20 13:36:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-20 13:36:53 +0100 |
| commit | 79ba800108e53b4012e66bbfa93ee12db4815c75 (patch) | |
| tree | 3d7794ebbef03c86fb4619b7e514ad64230650a3 /examples | |
| parent | c8a688a56da4404397cb0579715f9db5c53c3540 (diff) | |
| parent | 8ae390e75bf589b1591cdf5caa77b254b9ac0d8a (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Id732233d56e8d1706f62ef7a153d4a471406c551
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/dialogs/systemdialogs/FileDialogs.qml | 10 | ||||
| -rw-r--r-- | examples/quick/shared/shared.h | 8 | ||||
| -rw-r--r-- | examples/quick/window/window.qml | 1 |
3 files changed, 8 insertions, 11 deletions
diff --git a/examples/quick/dialogs/systemdialogs/FileDialogs.qml b/examples/quick/dialogs/systemdialogs/FileDialogs.qml index dca47ae1fd..bfc160fa45 100644 --- a/examples/quick/dialogs/systemdialogs/FileDialogs.qml +++ b/examples/quick/dialogs/systemdialogs/FileDialogs.qml @@ -175,16 +175,6 @@ Rectangle { // TODO: QTBUG-29814 This isn't portable, but we don't expose QDir::tempPath to QML yet. onClicked: fileDialog.folder = "/tmp" // file:///tmp would also be OK } - Button { - text: "set geometry" - anchors.verticalCenter: parent.verticalCenter - onClicked: { - fileDialog.width = Math.min(512, Screen.width * 0.9) - fileDialog.height = Math.min(340, Screen.height * 0.9) - fileDialog.x = (Screen.width - fileDialog.width) / 2 - fileDialog.y = (Screen.height - fileDialog.height) / 2 - } - } } } } diff --git a/examples/quick/shared/shared.h b/examples/quick/shared/shared.h index 5cf1333c02..d2f7c98311 100644 --- a/examples/quick/shared/shared.h +++ b/examples/quick/shared/shared.h @@ -49,8 +49,14 @@ app.setOrganizationDomain("qt-project.org");\ app.setApplicationName(QFileInfo(app.applicationFilePath()).baseName());\ QQuickView view;\ + if (qgetenv("QT_QUICK_CORE_PROFILE").toInt()) {\ + QSurfaceFormat f = view.format();\ + f.setProfile(QSurfaceFormat::CoreProfile);\ + f.setVersion(4, 4);\ + view.setFormat(f);\ + }\ view.connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit()));\ - view.engine()->setUrlInterceptor(new QQmlFileSelector(&view));\ + new QQmlFileSelector(view.engine(), &view);\ view.setSource(QUrl("qrc:///" #NAME ".qml")); \ view.setResizeMode(QQuickView::SizeRootObjectToView);\ if (QGuiApplication::platformName() == QLatin1String("qnx") || \ diff --git a/examples/quick/window/window.qml b/examples/quick/window/window.qml index 67e2ba40ff..00daec7ff1 100644 --- a/examples/quick/window/window.qml +++ b/examples/quick/window/window.qml @@ -140,6 +140,7 @@ QtObject { height: 240 color: "#215400" title: "Test Window with color " + color + flags: Qt.Window | Qt.WindowFullscreenButtonHint Rectangle { anchors.fill: parent anchors.margins: defaultSpacing |