diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-06-20 10:03:04 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-06-20 10:16:53 +0300 |
commit | e1ee6e0227144aa9defee3492fa7886c8b55a1c2 (patch) | |
tree | 48b95c4ebf1f5fcaa0e7a99ae722c9c0ee3b4dbc /examples | |
parent | 421a89336f6a561123e28687ba86167806a1b883 (diff) |
Make examples work without needing to install the module
Change-Id: Iae4ce2f9d97c19a3337e87ad67da120b58cf71c7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/barchart/barchart.pro | 1 | ||||
-rw-r--r-- | examples/examples.pri | 4 | ||||
-rw-r--r-- | examples/mapdata/mapdata.pro | 2 | ||||
-rw-r--r-- | examples/rainfall/rainfall.pro | 1 | ||||
-rw-r--r-- | examples/spectrum/spectrum.pro | 4 | ||||
-rw-r--r-- | examples/spectrum/spectrumapp/spectrumapp.pro | 10 | ||||
-rw-r--r-- | examples/widget/widget.pro | 2 |
7 files changed, 14 insertions, 10 deletions
diff --git a/examples/barchart/barchart.pro b/examples/barchart/barchart.pro index 381b3402..668b5195 100644 --- a/examples/barchart/barchart.pro +++ b/examples/barchart/barchart.pro @@ -3,6 +3,5 @@ } SOURCES += main.cpp -QT += datavis3d INSTALLS += target diff --git a/examples/examples.pri b/examples/examples.pri index f20862e7..7d8855f7 100644 --- a/examples/examples.pri +++ b/examples/examples.pri @@ -11,6 +11,10 @@ win32 { DESTDIR = $$OUT_PWD } +LIBS += -L$PWD/../lib + +QT += datavis3d + contains(TARGET, qml.*) { uri = com.digia.QtDataVis3D lib_name = datavis3dqml2 diff --git a/examples/mapdata/mapdata.pro b/examples/mapdata/mapdata.pro index 7ed5984e..091fdc7c 100644 --- a/examples/mapdata/mapdata.pro +++ b/examples/mapdata/mapdata.pro @@ -5,7 +5,7 @@ SOURCES += main.cpp mapdata.cpp HEADERS += mapdata.h -QT += datavis3d widgets +QT += widgets INSTALLS += target diff --git a/examples/rainfall/rainfall.pro b/examples/rainfall/rainfall.pro index 381b3402..668b5195 100644 --- a/examples/rainfall/rainfall.pro +++ b/examples/rainfall/rainfall.pro @@ -3,6 +3,5 @@ } SOURCES += main.cpp -QT += datavis3d INSTALLS += target diff --git a/examples/spectrum/spectrum.pro b/examples/spectrum/spectrum.pro index eb431bd8..9a8d45ae 100644 --- a/examples/spectrum/spectrum.pro +++ b/examples/spectrum/spectrum.pro @@ -1,7 +1,3 @@ -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} - qtHaveModule(multimedia) { include(spectrum.pri) diff --git a/examples/spectrum/spectrumapp/spectrumapp.pro b/examples/spectrum/spectrumapp/spectrumapp.pro index f73336a1..c2455f78 100644 --- a/examples/spectrum/spectrumapp/spectrumapp.pro +++ b/examples/spectrum/spectrumapp/spectrumapp.pro @@ -1,4 +1,10 @@ -include(../spectrum.pri) +!include( ../../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) +} + +!include( ../spectrum.pri ) { + error( "Couldn't find the spectrum.pri file!" ) +} static: error(This application cannot be statically linked to the fftreal library) @@ -6,7 +12,7 @@ TEMPLATE = app TARGET = spectrum -QT += multimedia datavis3d +QT += multimedia SOURCES += main.cpp \ engine.cpp \ diff --git a/examples/widget/widget.pro b/examples/widget/widget.pro index 1d7e91be..2b4078a4 100644 --- a/examples/widget/widget.pro +++ b/examples/widget/widget.pro @@ -5,6 +5,6 @@ SOURCES += main.cpp chart.cpp HEADERS += chart.h -QT += datavis3d widgets +QT += widgets INSTALLS += target |