diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-31 11:43:22 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-02-07 18:19:51 +0000 |
| commit | 1c571e5fe7a31e7accb04b37a1d3bd7c8855d05c (patch) | |
| tree | 65241f1258136d0c45bcaa3b51e1393a2f595e6a /tests/manual/qopengltextureblitter | |
| parent | 2145cdc54d5812793310f7e3b3709bfa2648bd50 (diff) | |
| parent | 4e7af2061e8c323b2a21f0549643a2cfab191664 (diff) | |
Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"
Diffstat (limited to 'tests/manual/qopengltextureblitter')
| -rw-r--r-- | tests/manual/qopengltextureblitter/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp | 2 |
2 files changed, 23 insertions, 1 deletions
diff --git a/tests/manual/qopengltextureblitter/CMakeLists.txt b/tests/manual/qopengltextureblitter/CMakeLists.txt new file mode 100644 index 0000000000..2c18c56d36 --- /dev/null +++ b/tests/manual/qopengltextureblitter/CMakeLists.txt @@ -0,0 +1,22 @@ +# Generated from qopengltextureblitter.pro. + +##################################################################### +## qopengltextureblitter Binary: +##################################################################### + +add_qt_manual_test(qopengltextureblitter + GUI + SOURCES + main.cpp + qopengltextureblitwindow.cpp qopengltextureblitwindow.h + INCLUDE_DIRECTORIES + . + LIBRARIES + Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::OpenGL # special case +) + +#### Keys ignored in scope 1:.:.:qopengltextureblitter.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp b/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp index f4e093a967..f8e033c927 100644 --- a/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp +++ b/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp @@ -29,7 +29,7 @@ #include "qopengltextureblitwindow.h" #include <QtGui/QPainter> -#include <QtGui/QOpenGLTexture> +#include <QtOpenGL/QOpenGLTexture> #include <QtGui/QOpenGLFunctions> #include <QtGui/QMatrix4x4> |