diff options
author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-10-20 13:18:59 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-10-22 10:08:51 +0000 |
commit | 31f9c57bc50ae053cfaf039a1dfdb128e2494458 (patch) | |
tree | 316138cb73c49877f5a80a8496c2f1b737122fb5 /tests/qmlcamera/qml/qmlcamera/Axes.qml | |
parent | 4162ddeb02ee41fd4217d7f3d93d45cab3313ba8 (diff) |
Fix issues with COIN builds
-Fix miscellaneous compile errors
-Move manual tests to manual folder and enable export of autotests
-Added widgets requirement
-Fixed autotests
-Fixed renderer and controller synchronization in QML case
-Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL
Change-Id: If6619733725d079e339bef16262e5ea1450ab20f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
Diffstat (limited to 'tests/qmlcamera/qml/qmlcamera/Axes.qml')
-rw-r--r-- | tests/qmlcamera/qml/qmlcamera/Axes.qml | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/tests/qmlcamera/qml/qmlcamera/Axes.qml b/tests/qmlcamera/qml/qmlcamera/Axes.qml deleted file mode 100644 index ec7933e5..00000000 --- a/tests/qmlcamera/qml/qmlcamera/Axes.qml +++ /dev/null @@ -1,49 +0,0 @@ -/****************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Data Visualization module. -** -** $QT_BEGIN_LICENSE:COMM$ -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** $QT_END_LICENSE$ -** -******************************************************************************/ - -import QtQuick 2.1 -import QtDataVisualization 1.0 - -Item { - property alias column: columnAxis - property alias expenses: expensesAxis - property alias income: incomeAxis - - // For row labels we can use row labels from data proxy, so default axis - // suffices for rows. - - // Custom labels for columns, since the data contains abbreviated month names. - CategoryAxis3D { - id: columnAxis - labels: ["January", "February", "March", "April", "May", "June", - "July", "August", "September", "October", "November", "December"] - } - ValueAxis3D { - id: incomeAxis - labelFormat: "%.2f M\u20AC" - title: "Monthly income" - } - ValueAxis3D { - id: expensesAxis - labelFormat: "-%.2f M\u20AC" - title: "Monthly expenses" - } -} |