diff options
Diffstat (limited to 'tools/qmlscene')
| -rw-r--r-- | tools/qmlscene/main.cpp | 9 | ||||
| -rw-r--r-- | tools/qmlscene/qmlscene.pro | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index 6ce676456c..f411c6becc 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -156,6 +156,7 @@ struct Options , quitImmediately(false) , resizeViewToRootItem(false) , multisample(false) + , coreProfile(false) , verbose(false) , applicationType(DefaultQmlApplicationType) { @@ -176,6 +177,7 @@ struct Options bool quitImmediately; bool resizeViewToRootItem; bool multisample; + bool coreProfile; bool verbose; QVector<Qt::ApplicationAttribute> applicationAttributes; QString translationFile; @@ -359,6 +361,7 @@ static void usage() puts(" --fullscreen ..................... Run fullscreen"); puts(" --transparent .................... Make the window transparent"); puts(" --multisample .................... Enable multisampling (OpenGL anti-aliasing)"); + puts(" --core-profile ................... Request a core profile OpenGL context"); puts(" --no-version-detection ........... Do not try to detect the version of the .qml file"); puts(" --slow-animations ................ Run all animations in slow motion"); puts(" --resize-to-root ................. Resize the window to the size of the root item"); @@ -523,6 +526,8 @@ int main(int argc, char ** argv) options.resizeViewToRootItem = true; else if (lowerArgument == QLatin1String("--multisample")) options.multisample = true; + else if (lowerArgument == QLatin1String("--core-profile")) + options.coreProfile = true; else if (lowerArgument == QLatin1String("--verbose")) options.verbose = true; else if (lowerArgument == QLatin1String("-i") && i + 1 < size) @@ -641,6 +646,10 @@ int main(int argc, char ** argv) window->setColor(QColor(Qt::transparent)); window->setFlags(Qt::FramelessWindowHint); } + if (options.coreProfile) { + surfaceFormat.setVersion(4, 1); + surfaceFormat.setProfile(QSurfaceFormat::CoreProfile); + } window->setFormat(surfaceFormat); if (window->flags() == Qt::Window) // Fix window flags unless set by QML. diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro index ec73f1871a..6a7df90ccc 100644 --- a/tools/qmlscene/qmlscene.pro +++ b/tools/qmlscene/qmlscene.pro @@ -7,13 +7,6 @@ SOURCES += main.cpp DEFINES += QML_RUNTIME_TESTING !contains(QT_CONFIG, no-qml-debug): DEFINES += QT_QML_DEBUG_NO_WARNING -QMAKE_TARGET_PRODUCT = qmlscene -QMAKE_TARGET_DESCRIPTION = Utility that loads and displays QML documents - -win32 { - VERSION = $${QT_VERSION}.0 -} else { - VERSION = $${QT_VERSION} -} +QMAKE_TARGET_DESCRIPTION = QML Scene Viewer load(qt_tool) |