diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-01-17 14:40:36 +0100 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-02-20 16:11:02 +0100 |
| commit | 4b611d649ede3bd1e56a73abcbd16aa60db38e3b (patch) | |
| tree | 6fd98bfdc95a3362981949d00e8237cfcfb1dd3a /examples/opengl/hellowindow | |
| parent | 012bb039e3c12d90546efcac84b1747b2a266c64 (diff) | |
Move QOpenGLShaderProgram from QtGui to QtOpenGL
Task-number: QTBUG-74409
Change-Id: I20dfafc0c9bf8e2b68b03e171d70c2cb4ad2bfaf
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'examples/opengl/hellowindow')
| -rw-r--r-- | examples/opengl/hellowindow/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/opengl/hellowindow/hellowindow.h | 2 | ||||
| -rw-r--r-- | examples/opengl/hellowindow/hellowindow.pro | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/examples/opengl/hellowindow/CMakeLists.txt b/examples/opengl/hellowindow/CMakeLists.txt index 58bd3fc362..876c282fbe 100644 --- a/examples/opengl/hellowindow/CMakeLists.txt +++ b/examples/opengl/hellowindow/CMakeLists.txt @@ -13,6 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples/opengl/hellowindow") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS OpenGL) add_qt_gui_executable(hellowindow hellowindow.cpp hellowindow.h @@ -23,6 +24,7 @@ target_link_libraries(hellowindow PUBLIC Qt::CorePrivate Qt::Gui Qt::GuiPrivate + Qt::OpenGL ) install(TARGETS hellowindow diff --git a/examples/opengl/hellowindow/hellowindow.h b/examples/opengl/hellowindow/hellowindow.h index e6d7970cfc..938c6409a4 100644 --- a/examples/opengl/hellowindow/hellowindow.h +++ b/examples/opengl/hellowindow/hellowindow.h @@ -52,7 +52,7 @@ #include <QColor> #include <QMutex> -#include <QOpenGLShaderProgram> +#include <QtOpenGL/QOpenGLShaderProgram> #include <QOpenGLBuffer> #include <QSharedPointer> #include <QTimer> diff --git a/examples/opengl/hellowindow/hellowindow.pro b/examples/opengl/hellowindow/hellowindow.pro index cc220fd344..27c274a378 100644 --- a/examples/opengl/hellowindow/hellowindow.pro +++ b/examples/opengl/hellowindow/hellowindow.pro @@ -1,4 +1,4 @@ -QT += gui-private core-private +QT += gui-private core-private opengl HEADERS += hellowindow.h SOURCES += hellowindow.cpp main.cpp |