summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-05-20 08:50:34 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-05-20 09:03:07 +0300
commitb20152f6672e5e4bfd4c0d4dc1fc993e8a21ea68 (patch)
tree6954c03f5f480f321cd3872bfcf1952dbb3e8b0c
parent9891c9494797cb87f93dd50a430d604fee1af5df (diff)
Fix build issues
Module version number (MODULE_VERSION) to 5.1.0, otherwise you get dll name Qt0DataVis3Dd.dll. Removed spectrum example from builds that do not include multimedia module. Change-Id: I20f61cc10c7b537e8897478dfd37ac61e3e4c683 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r--.qmake.conf2
-rw-r--r--examples/examples.pro5
2 files changed, 4 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf
index b60953ff..cee97767 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,2 +1,2 @@
-MODULE_VERSION=0.0.1
+MODULE_VERSION=5.1.0
load(qt_build_config) \ No newline at end of file
diff --git a/examples/examples.pro b/examples/examples.pro
index 1590d127..4d5e5a5b 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,6 +1,7 @@
TEMPLATE = subdirs
SUBDIRS += barchart \
rainfall \
- spectrum \
widget \
- mapdata \ No newline at end of file
+ mapdata
+
+qtHaveModule(multimedia): SUBDIRS += spectrum