diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-16 13:08:19 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-16 14:44:13 +0200 |
commit | db8f2ba54ffffc30e37adb7986a373b27ec3efa6 (patch) | |
tree | 6fe8f7df312b0418741f1debf75650d794760579 | |
parent | 0ba893d951753c560ed8187bf01e879e37ab817e (diff) |
Fix minimal applications
Also added minimal applications to tests
Change-Id: Ie4cb702dfb1ff8e771c2de68e74099ac12f32e23
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
-rw-r--r-- | src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp | 1 | ||||
-rw-r--r-- | src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp | 1 | ||||
-rw-r--r-- | src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp | 1 | ||||
-rw-r--r-- | src/datavisualization/engine/q3dbars.cpp | 4 | ||||
-rw-r--r-- | src/datavisualization/engine/q3dscatter.cpp | 4 | ||||
-rw-r--r-- | src/datavisualization/engine/q3dsurface.cpp | 4 | ||||
-rw-r--r-- | tests/minimalbars/minimalbars.pro | 6 | ||||
-rw-r--r-- | tests/minimalscatter/minimalscatter.pro | 6 | ||||
-rw-r--r-- | tests/minimalsurface/minimalsurface.pro | 6 | ||||
-rw-r--r-- | tests/tests.pro | 6 |
10 files changed, 36 insertions, 3 deletions
diff --git a/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp b/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp index d0cd0346..2b4a0aed 100644 --- a/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp +++ b/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp @@ -27,6 +27,7 @@ int main(int argc, char **argv) //! [4] Q3DBars bars; + bars.setFlags(bars.flags() ^ Qt::FramelessWindowHint); //! [4] //! [0] bars.rowAxis()->setRange(0, 4); diff --git a/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp b/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp index 949afadc..15820bf1 100644 --- a/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp +++ b/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp @@ -27,6 +27,7 @@ int main(int argc, char **argv) //! [0] Q3DScatter scatter; + scatter.setFlags(scatter.flags() ^ Qt::FramelessWindowHint); //! [0] //! [1] QScatter3DSeries *series = new QScatter3DSeries; diff --git a/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp b/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp index d0833ca2..245be2f4 100644 --- a/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp +++ b/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp @@ -27,6 +27,7 @@ int main(int argc, char **argv) //! [0] Q3DSurface surface; + surface.setFlags(surface.flags() ^ Qt::FramelessWindowHint); //! [0] //! [1] QSurfaceDataArray *data = new QSurfaceDataArray; diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp index 85e52768..ef77c34f 100644 --- a/src/datavisualization/engine/q3dbars.cpp +++ b/src/datavisualization/engine/q3dbars.cpp @@ -55,7 +55,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * * \section1 How to construct a minimal Q3DBars graph * - * First, construct an instance of Q3DBars: + * First, construct an instance of Q3DBars. Since we are running the graph as top level window + * in this example, we need to clear the \c Qt::FramelessWindowHint flag, which gets set by + * default: * * \snippet doc_src_q3dbars_construction.cpp 4 * diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp index 03529b85..b19a82a3 100644 --- a/src/datavisualization/engine/q3dscatter.cpp +++ b/src/datavisualization/engine/q3dscatter.cpp @@ -50,7 +50,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * * \section1 How to construct a minimal Q3DScatter graph * - * First, construct Q3DScatter: + * First, construct Q3DScatter. Since we are running the graph as top level window + * in this example, we need to clear the \c Qt::FramelessWindowHint flag, which gets set by + * default: * * \snippet doc_src_q3dscatter_construction.cpp 0 * diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp index a772218b..f523de1b 100644 --- a/src/datavisualization/engine/q3dsurface.cpp +++ b/src/datavisualization/engine/q3dsurface.cpp @@ -55,7 +55,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * * \section1 How to construct a minimal Q3DSurface graph * - * First, construct Q3DSurface: + * First, construct Q3DSurface. Since we are running the graph as top level window + * in this example, we need to clear the \c Qt::FramelessWindowHint flag, which gets set by + * default: * * \snippet doc_src_q3dsurface_construction.cpp 0 * diff --git a/tests/minimalbars/minimalbars.pro b/tests/minimalbars/minimalbars.pro new file mode 100644 index 00000000..b948a31f --- /dev/null +++ b/tests/minimalbars/minimalbars.pro @@ -0,0 +1,6 @@ +QT += core gui datavisualization + +TARGET = MinimalBars +TEMPLATE = app + +SOURCES += ../../src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp diff --git a/tests/minimalscatter/minimalscatter.pro b/tests/minimalscatter/minimalscatter.pro new file mode 100644 index 00000000..6fd9913d --- /dev/null +++ b/tests/minimalscatter/minimalscatter.pro @@ -0,0 +1,6 @@ +QT += core gui datavisualization + +TARGET = MinimalScatter +TEMPLATE = app + +SOURCES += ../../src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp diff --git a/tests/minimalsurface/minimalsurface.pro b/tests/minimalsurface/minimalsurface.pro new file mode 100644 index 00000000..4ff9b485 --- /dev/null +++ b/tests/minimalsurface/minimalsurface.pro @@ -0,0 +1,6 @@ +QT += core gui datavisualization + +TARGET = minimalSurface +TEMPLATE = app + +SOURCES += ../../src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp diff --git a/tests/tests.pro b/tests/tests.pro index ecff7443..01b0f109 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -17,3 +17,9 @@ SUBDIRS += barstest \ #SUBDIRS += kinectsurface qtHaveModule(multimedia):!android: SUBDIRS += spectrum + +# For testing code snippets of minimal applications +SUBDIRS += minimalbars \ + minimalscatter \ + minimalsurface + |