From db4fa86cffefbc34b8da7961103ac97424ff41e9 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 23 Jan 2014 09:03:00 +0200 Subject: Add example for showing graph legend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +Fix default theme Task-number: QTRD-2653 Change-Id: Iccf4161cd19a9dfe6226189568efeb4565ba53ed Reviewed-by: Tomi Korpipää --- examples/examples.pro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'examples/examples.pro') diff --git a/examples/examples.pro b/examples/examples.pro index d126b26d..73db54c0 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -2,7 +2,9 @@ TEMPLATE = subdirs SUBDIRS += qmlbars \ qmlscatter \ qmlsurface \ - qmlcustominput + qmlcustominput \ + qmllegend + !android: { SUBDIRS += bars \ custominput \ -- cgit v1.2.3 From 44df7a357fc3d9f977ed36b4199d996869a396e9 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 23 Jan 2014 11:04:58 +0200 Subject: Move qmlmultigraphs to examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +Fix Q3DScene::isPointInPrimarySubView +Fix Q3DScene::isPointInSecondarySubView +Remove some unnecessary imports from examples Task-number: QTRD-2800 Change-Id: I5a9bc737c5ee92edbb514e76054adbb54076aef8 Reviewed-by: Tomi Korpipää --- examples/examples.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'examples/examples.pro') diff --git a/examples/examples.pro b/examples/examples.pro index 73db54c0..316287f4 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -3,7 +3,8 @@ SUBDIRS += qmlbars \ qmlscatter \ qmlsurface \ qmlcustominput \ - qmllegend + qmllegend \ + qmlmultigraph !android: { SUBDIRS += bars \ -- cgit v1.2.3 From 05d06fbc61f07e400b519a9b020c2473398627c1 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 27 Jan 2014 13:04:22 +0200 Subject: Remove c++ examples from ios builds Change-Id: Icc963dedb4651d70ccfdf61775e2c9236cd5b1bb Reviewed-by: Miikka Heikkinen --- examples/examples.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/examples.pro') diff --git a/examples/examples.pro b/examples/examples.pro index 316287f4..4dd3edef 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -6,7 +6,7 @@ SUBDIRS += qmlbars \ qmllegend \ qmlmultigraph -!android: { +!android:!ios { SUBDIRS += bars \ custominput \ customproxy \ -- cgit v1.2.3