diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-08-26 16:40:19 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-08-27 08:43:40 +0000 |
| commit | 43262d1c5ca6eb8ec237972b8c8f1dd6fcd2d39e (patch) | |
| tree | 7612e45f70a3f04c00e6fb5f3987f1c2363f9d43 /examples | |
| parent | 5a7126d1c522c90f2668eb47752ea12d8b244522 (diff) | |
Fix examples install
Removed example.pri and added missing EXAMPLE_FILES declarations
to make installed examples buildable.
Change-Id: I20fad76429b7e4a2af684999de9b894e4fca59dd
Task-number: QTBUG-46997
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Diffstat (limited to 'examples')
10 files changed, 40 insertions, 31 deletions
diff --git a/examples/canvas3d/canvas3d/canvas3d.pro b/examples/canvas3d/canvas3d/canvas3d.pro index 0f603bc..27ffaec 100644 --- a/examples/canvas3d/canvas3d/canvas3d.pro +++ b/examples/canvas3d/canvas3d/canvas3d.pro @@ -7,3 +7,5 @@ SUBDIRS += textureandlight \ threejs OTHER_FILES += 3rdparty/* + +EXAMPLE_FILES = 3rdparty diff --git a/examples/canvas3d/canvas3d/framebuffer/framebuffer.pro b/examples/canvas3d/canvas3d/framebuffer/framebuffer.pro index 87908ec..4bf4cb1 100644 --- a/examples/canvas3d/canvas3d/framebuffer/framebuffer.pro +++ b/examples/canvas3d/canvas3d/framebuffer/framebuffer.pro @@ -1,6 +1,9 @@ -!include( ../../../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} +TEMPLATE = app + +QT += qml quick + +target.path = $$[QT_INSTALL_EXAMPLES]/canvas3d/$$TARGET +INSTALLS += target SOURCES += main.cpp diff --git a/examples/canvas3d/canvas3d/interaction/interaction.pro b/examples/canvas3d/canvas3d/interaction/interaction.pro index a367e73..94dd9d0 100644 --- a/examples/canvas3d/canvas3d/interaction/interaction.pro +++ b/examples/canvas3d/canvas3d/interaction/interaction.pro @@ -1,6 +1,9 @@ -!include( ../../../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} +TEMPLATE = app + +QT += qml quick + +target.path = $$[QT_INSTALL_EXAMPLES]/canvas3d/$$TARGET +INSTALLS += target SOURCES += main.cpp diff --git a/examples/canvas3d/canvas3d/jsonmodels/jsonmodels.pro b/examples/canvas3d/canvas3d/jsonmodels/jsonmodels.pro index 2a0d4a1..f8f6b80 100644 --- a/examples/canvas3d/canvas3d/jsonmodels/jsonmodels.pro +++ b/examples/canvas3d/canvas3d/jsonmodels/jsonmodels.pro @@ -1,6 +1,9 @@ -!include( ../../../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} +TEMPLATE = app + +QT += qml quick + +target.path = $$[QT_INSTALL_EXAMPLES]/canvas3d/$$TARGET +INSTALLS += target SOURCES += main.cpp diff --git a/examples/canvas3d/canvas3d/quickitemtexture/quickitemtexture.pro b/examples/canvas3d/canvas3d/quickitemtexture/quickitemtexture.pro index bbfa099..f222aa4 100644 --- a/examples/canvas3d/canvas3d/quickitemtexture/quickitemtexture.pro +++ b/examples/canvas3d/canvas3d/quickitemtexture/quickitemtexture.pro @@ -1,6 +1,9 @@ -!include( ../../../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} +TEMPLATE = app + +QT += qml quick + +target.path = $$[QT_INSTALL_EXAMPLES]/canvas3d/$$TARGET +INSTALLS += target SOURCES += main.cpp diff --git a/examples/canvas3d/canvas3d/textureandlight/textureandlight.pro b/examples/canvas3d/canvas3d/textureandlight/textureandlight.pro index c8d3c63..74452d1 100644 --- a/examples/canvas3d/canvas3d/textureandlight/textureandlight.pro +++ b/examples/canvas3d/canvas3d/textureandlight/textureandlight.pro @@ -1,6 +1,9 @@ -!include( ../../../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} +TEMPLATE = app + +QT += qml quick + +target.path = $$[QT_INSTALL_EXAMPLES]/canvas3d/$$TARGET +INSTALLS += target SOURCES += main.cpp diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.pro b/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.pro index 6860e26..d3efb1b 100644 --- a/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.pro +++ b/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.pro @@ -1,11 +1,10 @@ -!include( ../../../../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} - TEMPLATE = app QT += qml quick +target.path = $$[QT_INSTALL_EXAMPLES]/canvas3d/$$TARGET +INSTALLS += target + SOURCES += main.cpp OTHER_FILES += doc/src/* \ diff --git a/examples/canvas3d/canvas3d/threejs/planets/planets.pro b/examples/canvas3d/canvas3d/threejs/planets/planets.pro index 2f9eae9..559da48 100644 --- a/examples/canvas3d/canvas3d/threejs/planets/planets.pro +++ b/examples/canvas3d/canvas3d/threejs/planets/planets.pro @@ -1,11 +1,10 @@ -!include( ../../../../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} - TEMPLATE = app QT += qml quick +target.path = $$[QT_INSTALL_EXAMPLES]/canvas3d/$$TARGET +INSTALLS += target + SOURCES += main.cpp OTHER_FILES += *.qml \ diff --git a/examples/canvas3d/canvas3d/threejs/threejs.pro b/examples/canvas3d/canvas3d/threejs/threejs.pro index 4372297..c39ab7f 100644 --- a/examples/canvas3d/canvas3d/threejs/threejs.pro +++ b/examples/canvas3d/canvas3d/threejs/threejs.pro @@ -1,3 +1,5 @@ TEMPLATE = subdirs SUBDIRS += oneqt \ planets + +EXAMPLE_FILES = controls diff --git a/examples/examples.pri b/examples/examples.pri deleted file mode 100644 index e8d906d..0000000 --- a/examples/examples.pri +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDEPATH += ../../../include - -TEMPLATE = app - -QT += qml quick - -target.path = $$[QT_INSTALL_EXAMPLES]/canvas3d/$$TARGET -INSTALLS += target |