Fix shaders for OpenGL core profiles

Add also a --coreprofile command-line parameter to the gallery and
systemdialogs examples to allow testing Quick Controls with an OpenGL 3.2+
core profile.

This depends on the new features introduced to qtdeclarative in
I75a47182 and I41b513e9.

Change-Id: I408263a108a71df221943915849a4c3e18e0d3e4
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>

2 files changed, 16 insertions, 0 deletions

diff --git a/examples/quick/controls/gallery/src/main.cpp b/examples/quick/controls/gallery/src/main.cpp
index a757f485..b0d12b85 100644
--- a/examples/quick/controls/gallery/src/main.cpp
+++ b/examples/quick/controls/gallery/src/main.cpp
@@ -40,10 +40,18 @@
 
 #include "qtquickcontrolsapplication.h"
 #include <QtQml/QQmlApplicationEngine>
+#include <QtGui/QSurfaceFormat>
+#include <QtQuick/QQuickWindow>
 
 int main(int argc, char *argv[])
 {
     QtQuickControlsApplication app(argc, argv);
+    if (QCoreApplication::arguments().contains(QLatin1String("--coreprofile"))) {
+        QSurfaceFormat fmt = QQuickWindow::defaultFormat();
+        fmt.setVersion(4, 4);
+        fmt.setProfile(QSurfaceFormat::CoreProfile);
+        QQuickWindow::setDefaultFormat(fmt);
+    }
     QQmlApplicationEngine engine(QUrl("qrc:/main.qml"));
     return app.exec();
 }
diff --git a/examples/quick/dialogs/systemdialogs/main.cpp b/examples/quick/dialogs/systemdialogs/main.cpp
index fd882200..6d0fef3c 100644
--- a/examples/quick/dialogs/systemdialogs/main.cpp
+++ b/examples/quick/dialogs/systemdialogs/main.cpp
@@ -40,10 +40,18 @@
 
 #include "qtquickcontrolsapplication.h"
 #include <QtQml/QQmlApplicationEngine>
+#include <QtGui/QSurfaceFormat>
+#include <QtQuick/QQuickWindow>
 
 int main(int argc, char *argv[])
 {
     QtQuickControlsApplication app(argc, argv);
+    if (QCoreApplication::arguments().contains(QLatin1String("--coreprofile"))) {
+        QSurfaceFormat fmt = QQuickWindow::defaultFormat();
+        fmt.setVersion(4, 4);
+        fmt.setProfile(QSurfaceFormat::CoreProfile);
+        QQuickWindow::setDefaultFormat(fmt);
+    }
     QQmlApplicationEngine engine(QUrl("qrc:/dialogs/systemdialogs/systemdialogs.qml"));
     return app.exec();
 }