diff options
| author | Morten Johan Sørvig <morten.sorvig@theqtcompany.com> | 2015-05-13 21:30:04 +0200 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-05-14 07:57:11 +0000 |
| commit | a4cba90e194a65930c0e66469cd2ef2cc5c1f5ed (patch) | |
| tree | 4685ef313a0ee0b637d436aad193e39bec37ae29 /examples | |
| parent | e905526090feb798e5746412027d2d757d2ff7b5 (diff) | |
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 <jake.petroules@petroules.com>
Diffstat (limited to 'examples')
7 files changed, 7 insertions, 7 deletions
diff --git a/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro b/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro index e0067cf27f..6171450925 100644 --- a/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro +++ b/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro @@ -5,7 +5,7 @@ RESOURCES += framebufferobject2.qrc QT += opengl widgets # install -target.path = $$[QT_INSTALL_EXAMPLES]/opengl/framebufferobject2 +target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/framebufferobject2 INSTALLS += target contains(QT_CONFIG, opengles.) { diff --git a/examples/opengl/legacy/grabber/grabber.pro b/examples/opengl/legacy/grabber/grabber.pro index b8567580f0..88485ff183 100644 --- a/examples/opengl/legacy/grabber/grabber.pro +++ b/examples/opengl/legacy/grabber/grabber.pro @@ -6,7 +6,7 @@ SOURCES = glwidget.cpp \ QT += opengl widgets # install -target.path = $$[QT_INSTALL_EXAMPLES]/opengl/grabber +target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/grabber INSTALLS += target contains(QT_CONFIG, opengles.) { diff --git a/examples/opengl/legacy/hellogl/hellogl.pro b/examples/opengl/legacy/hellogl/hellogl.pro index 500bd85b3c..01e8ca1f74 100644 --- a/examples/opengl/legacy/hellogl/hellogl.pro +++ b/examples/opengl/legacy/hellogl/hellogl.pro @@ -11,7 +11,7 @@ SOURCES = glwidget.cpp \ QT += opengl widgets # install -target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl +target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/hellogl INSTALLS += target contains(QT_CONFIG, opengles.) { diff --git a/examples/opengl/legacy/overpainting/overpainting.pro b/examples/opengl/legacy/overpainting/overpainting.pro index c1bda7853d..9187314b75 100644 --- a/examples/opengl/legacy/overpainting/overpainting.pro +++ b/examples/opengl/legacy/overpainting/overpainting.pro @@ -13,7 +13,7 @@ SOURCES = bubble.cpp \ qtlogo.cpp # install -target.path = $$[QT_INSTALL_EXAMPLES]/opengl/overpainting +target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/overpainting INSTALLS += target contains(QT_CONFIG, opengles.) { diff --git a/examples/opengl/legacy/pbuffers/pbuffers.pro b/examples/opengl/legacy/pbuffers/pbuffers.pro index a349e39f68..fe88de05d1 100644 --- a/examples/opengl/legacy/pbuffers/pbuffers.pro +++ b/examples/opengl/legacy/pbuffers/pbuffers.pro @@ -7,7 +7,7 @@ RESOURCES += pbuffers.qrc QT += opengl widgets # install -target.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers +target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/pbuffers INSTALLS += target contains(QT_CONFIG, opengles.) { 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.) { diff --git a/examples/opengl/legacy/samplebuffers/samplebuffers.pro b/examples/opengl/legacy/samplebuffers/samplebuffers.pro index b57599aae4..9b471243f3 100644 --- a/examples/opengl/legacy/samplebuffers/samplebuffers.pro +++ b/examples/opengl/legacy/samplebuffers/samplebuffers.pro @@ -4,7 +4,7 @@ SOURCES += glwidget.cpp main.cpp QT += opengl widgets # install -target.path = $$[QT_INSTALL_EXAMPLES]/opengl/samplebuffers +target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/samplebuffers INSTALLS += target contains(QT_CONFIG, opengles.) { |