From c544258484ff4fd5d2b88402fbaa5d154b89a3a2 Mon Sep 17 00:00:00 2001 From: Titta Heikkala Date: Tue, 1 Jul 2014 07:10:00 +0300 Subject: Qt Charts project file structure change Charts repository structure is changed to follow the structure of a Qt Add-On module. The task includes following changes: - All macros and definitions named 'commercial' have been renamed. - Compile errors related to QString and qSort usage have been fixed. - Old demos are moved under examples. The QML examples now support only Qt Quick 2.0, the support for Qt Quick 1 is removed. - The QML examples with multiple views are updated so that they are usable also with touch devices. - Unnecessary version checks are removed from examples. - The build stamp has been removed as it was only meant for Charts development purposes and it's no longer needed. Also development build related debug prints are removed as __DATE__ can't be used for all OS thus it doesn't make much sense. - Documentation structure has been updated based on the new module structure. The raw HTML files have been removed. Demos are combined to examples. - Unnecessary .qdocinc files are no longer needed. The content is moved to the corresponding .cpp files. - The Charts widget designer plugin is updated according to the module change. - The test cases updated according to the project structure change. Tests are added also for version 2.0. - cmake modules generation is not needed with Qt 5.4 and Qt Charts so it's disabled. - The new module name and version are updated to the plugin.qmltypes file. Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228, QTRD-2526, QTRD-3233, QTRD-3222 Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160 Reviewed-by: Miikka Heikkinen --- examples/donutbreakdown/mainslice.cpp | 57 ----------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 examples/donutbreakdown/mainslice.cpp (limited to 'examples/donutbreakdown/mainslice.cpp') diff --git a/examples/donutbreakdown/mainslice.cpp b/examples/donutbreakdown/mainslice.cpp deleted file mode 100644 index b907df19..00000000 --- a/examples/donutbreakdown/mainslice.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the Qt Enterprise Charts Add-on. -** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "mainslice.h" - -QTCOMMERCIALCHART_USE_NAMESPACE - -//![1] -MainSlice::MainSlice(QPieSeries *breakdownSeries, QObject *parent) - : QPieSlice(parent), - m_breakdownSeries(breakdownSeries) -{ - connect(this, SIGNAL(percentageChanged()), this, SLOT(updateLabel())); -} -//![1] - -QPieSeries *MainSlice::breakdownSeries() const -{ - return m_breakdownSeries; -} - -void MainSlice::setName(QString name) -{ - m_name = name; -} - -QString MainSlice::name() const -{ - return m_name; -} - -//![2] -void MainSlice::updateLabel() -{ - this->setLabel(QString("%1 %2%").arg(m_name).arg(percentage() * 100, 0, 'f', 2)); -} -//![2] - -#include "moc_mainslice.cpp" - -- cgit v1.2.3