Fix exclusion for legacy Open GL examples.
Add dynamic GL and remove warning about ANGLE since that package no longer exists. Task-number: QTBUG-46103 Change-Id: Icf93d1105434395a3c9ad61bb8c921fcedfc7137 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
This commit is contained in:
parent
d1528919de
commit
9d85490ea2
@ -8,8 +8,4 @@ QT += opengl widgets
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/framebufferobject2
|
||||
INSTALLS += target
|
||||
|
||||
contains(QT_CONFIG, opengles.) {
|
||||
contains(QT_CONFIG, angle): \
|
||||
warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c")
|
||||
error("This example requires Qt to be configured with -opengl desktop")
|
||||
}
|
||||
contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
|
||||
|
@ -9,8 +9,4 @@ QT += opengl widgets
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/grabber
|
||||
INSTALLS += target
|
||||
|
||||
contains(QT_CONFIG, opengles.) {
|
||||
contains(QT_CONFIG, angle): \
|
||||
warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c")
|
||||
error("This example requires Qt to be configured with -opengl desktop")
|
||||
}
|
||||
contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
|
||||
|
@ -14,8 +14,4 @@ QT += opengl widgets
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/hellogl
|
||||
INSTALLS += target
|
||||
|
||||
contains(QT_CONFIG, opengles.) {
|
||||
contains(QT_CONFIG, angle): \
|
||||
warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c")
|
||||
error("This example requires Qt to be configured with -opengl desktop")
|
||||
}
|
||||
contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
|
||||
|
@ -16,8 +16,4 @@ SOURCES = bubble.cpp \
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/overpainting
|
||||
INSTALLS += target
|
||||
|
||||
contains(QT_CONFIG, opengles.) {
|
||||
contains(QT_CONFIG, angle): \
|
||||
warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c")
|
||||
error("This example requires Qt to be configured with -opengl desktop")
|
||||
}
|
||||
contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
|
||||
|
@ -10,8 +10,4 @@ QT += opengl widgets
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/pbuffers
|
||||
INSTALLS += target
|
||||
|
||||
contains(QT_CONFIG, opengles.) {
|
||||
contains(QT_CONFIG, angle): \
|
||||
warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c")
|
||||
error("This example requires Qt to be configured with -opengl desktop")
|
||||
}
|
||||
contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
|
||||
|
@ -8,8 +8,4 @@ RESOURCES += pbuffers2.qrc
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/pbuffers2
|
||||
INSTALLS += target
|
||||
|
||||
contains(QT_CONFIG, opengles.) {
|
||||
contains(QT_CONFIG, angle): \
|
||||
warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c")
|
||||
error("This example requires Qt to be configured with -opengl desktop")
|
||||
}
|
||||
contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
|
||||
|
@ -7,8 +7,4 @@ QT += opengl widgets
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/samplebuffers
|
||||
INSTALLS += target
|
||||
|
||||
contains(QT_CONFIG, opengles.) {
|
||||
contains(QT_CONFIG, angle): \
|
||||
warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c")
|
||||
error("This example requires Qt to be configured with -opengl desktop")
|
||||
}
|
||||
contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
|
||||
|
@ -1,10 +1,6 @@
|
||||
QT += opengl widgets
|
||||
|
||||
contains(QT_CONFIG, opengles.) {
|
||||
contains(QT_CONFIG, angle): \
|
||||
warning("Qt was built with ANGLE, which provides only OpenGL ES 2.0 on top of DirectX 9.0c")
|
||||
error("This example requires Qt to be configured with -opengl desktop")
|
||||
}
|
||||
contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
|
||||
|
||||
HEADERS += 3rdparty/fbm.h \
|
||||
glbuffers.h \
|
||||
|
Loading…
Reference in New Issue
Block a user