diff options
| author | Heikkinen Miikka <miikka.heikkinen@digia.com> | 2013-09-04 14:48:34 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-05 07:44:09 +0300 |
| commit | 263f8a781050512382909c5173373a4ced21ae60 (patch) | |
| tree | 6b688021acede309e31dc9bf26ee5a1c32bd57b2 /examples | |
| parent | c8ffadfcb58102c0ea09f75e2517923da00cfbb2 (diff) | |
Fixed various issues
+Valgrind reported memory leaks
+Linux build warnings
+Bartest ui layout more friendly for smaller screen
Change-Id: I9773e374ccf8bd6be877cb9be599b50556f04d9d
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qmlscatter/qmlscatter.qrc | 2 | ||||
| -rw-r--r-- | examples/rainfall/main.cpp | 12 | ||||
| -rw-r--r-- | examples/rainfall/variantbardataproxy.cpp | 1 | ||||
| -rw-r--r-- | examples/rainfall/variantbardataproxy.h | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/examples/qmlscatter/qmlscatter.qrc b/examples/qmlscatter/qmlscatter.qrc index 61f0f4fe..365dec1f 100644 --- a/examples/qmlscatter/qmlscatter.qrc +++ b/examples/qmlscatter/qmlscatter.qrc @@ -1,7 +1,7 @@ <RCC> <qresource prefix="/qml"> <file alias="main.qml">qml/qmlscatter/main.qml</file> - <file alias="Button.qml">qml/qmlscatter/Button.qml</file> <file alias="Data.qml">qml/qmlscatter/data.qml</file> + <file alias="Button.qml">qml/qmlscatter/button.qml</file> </qresource> </RCC> diff --git a/examples/rainfall/main.cpp b/examples/rainfall/main.cpp index 2b9b2861..a4e316be 100644 --- a/examples/rainfall/main.cpp +++ b/examples/rainfall/main.cpp @@ -25,13 +25,13 @@ int main(int argc, char **argv) { QGuiApplication app(argc, argv); - Q3DBars rainfall; - rainfall.resize(1280, 800); - rainfall.setPosition(QPoint(10, 30)); - rainfall.show(); + Q3DBars *rainfall = new Q3DBars; + rainfall->resize(1280, 800); + rainfall->setPosition(QPoint(10, 30)); + rainfall->show(); - RainfallChart *rainfallchart = new RainfallChart(&rainfall); - rainfallchart->start(); + RainfallChart rainfallchart(rainfall); + rainfallchart.start(); return app.exec(); } diff --git a/examples/rainfall/variantbardataproxy.cpp b/examples/rainfall/variantbardataproxy.cpp index bacab501..b01c7616 100644 --- a/examples/rainfall/variantbardataproxy.cpp +++ b/examples/rainfall/variantbardataproxy.cpp @@ -35,6 +35,7 @@ VariantBarDataProxy::VariantBarDataProxy(VariantDataSet *newSet, VariantBarDataProxy::~VariantBarDataProxy() { + delete m_dataSet; } void VariantBarDataProxy::setDataSet(VariantDataSet *newSet) diff --git a/examples/rainfall/variantbardataproxy.h b/examples/rainfall/variantbardataproxy.h index 2c80c0b1..acef9999 100644 --- a/examples/rainfall/variantbardataproxy.h +++ b/examples/rainfall/variantbardataproxy.h @@ -59,8 +59,6 @@ private: QPointer<VariantBarDataMapping> m_mapping; Q_DISABLE_COPY(VariantBarDataProxy) - - friend class VariantBarDataProxy; }; #endif |