From a4cba90e194a65930c0e66469cd2ef2cc5c1f5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Wed, 13 May 2015 21:30:04 +0200 Subject: Set correct target.path for legacy GL examples Fix Library not loaded/image not found error on application startup. With @rpath enabled (commit 6e18f57a) qmake now requires a correct target.path in order to emit correct -rpath @loader_path linker directives. Change-Id: Ia32b038ad2d64819477be5cd9d1ed36768e2251b Reviewed-by: Jake Petroules --- examples/opengl/legacy/pbuffers2/pbuffers2.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/opengl/legacy/pbuffers2/pbuffers2.pro') diff --git a/examples/opengl/legacy/pbuffers2/pbuffers2.pro b/examples/opengl/legacy/pbuffers2/pbuffers2.pro index f9dd269eea..f331498d3a 100644 --- a/examples/opengl/legacy/pbuffers2/pbuffers2.pro +++ b/examples/opengl/legacy/pbuffers2/pbuffers2.pro @@ -5,7 +5,7 @@ SOURCES += glwidget.cpp main.cpp RESOURCES += pbuffers2.qrc # install -target.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers2 +target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/pbuffers2 INSTALLS += target contains(QT_CONFIG, opengles.) { -- cgit v1.2.3 From 9d85490ea2171f1fbad1e6a264db835fc0e9a702 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 15 May 2015 09:59:08 +0200 Subject: 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 --- examples/opengl/legacy/pbuffers2/pbuffers2.pro | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'examples/opengl/legacy/pbuffers2/pbuffers2.pro') diff --git a/examples/opengl/legacy/pbuffers2/pbuffers2.pro b/examples/opengl/legacy/pbuffers2/pbuffers2.pro index f331498d3a..2ba40a6f74 100644 --- a/examples/opengl/legacy/pbuffers2/pbuffers2.pro +++ b/examples/opengl/legacy/pbuffers2/pbuffers2.pro @@ -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") -- cgit v1.2.3