diff options
author | Titta Heikkala <titta.heikkala@digia.com> | 2014-07-01 07:10:00 +0300 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2014-10-14 13:04:52 +0300 |
commit | c544258484ff4fd5d2b88402fbaa5d154b89a3a2 (patch) | |
tree | 7659625abb566dec55d3783ed820b928542d9b2b /plugins/declarative/declarativemargins.cpp | |
parent | 76339f714f088645e911cee65bdb66055fe029aa (diff) |
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 <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'plugins/declarative/declarativemargins.cpp')
-rw-r--r-- | plugins/declarative/declarativemargins.cpp | 121 |
1 files changed, 0 insertions, 121 deletions
diff --git a/plugins/declarative/declarativemargins.cpp b/plugins/declarative/declarativemargins.cpp deleted file mode 100644 index 2010b3be..00000000 --- a/plugins/declarative/declarativemargins.cpp +++ /dev/null @@ -1,121 +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 "declarativemargins.h" -#include <QDataStream> -#include <QDebug> - -QTCOMMERCIALCHART_BEGIN_NAMESPACE - -#ifdef QDOC_QT5 -/*! - \qmltype Margins - \inqmlmodule QtCommercial.Chart - - \include doc/src/margins.qdocinc -*/ -#else -/*! - \qmlclass Margins - - \include ../doc/src/margins.qdocinc -*/ -#endif - -/*! - \qmlproperty int Margins::top - The top margin. -*/ - -/*! - \qmlproperty int Margins::bottom - The bottom margin. -*/ - -/*! - \qmlproperty int Margins::left - The left margin. -*/ - -/*! - \qmlproperty int Margins::right - The right margin. -*/ - -DeclarativeMargins::DeclarativeMargins(QObject *parent) : - QObject(parent) -{ - QMargins::setTop(0); - QMargins::setBottom(0); - QMargins::setLeft(0); - QMargins::setRight(0); -} - -void DeclarativeMargins::setTop(int top) -{ - if (top < 0) { - qWarning() << "Cannot set top margin to a negative value:" << top; - } else { - if (top != QMargins::top()) { - QMargins::setTop(top); - emit topChanged(QMargins::top(), QMargins::bottom(), QMargins::left(), QMargins::right()); - } - } -} - -void DeclarativeMargins::setBottom(int bottom) -{ - if (bottom < 0) { - qWarning() << "Cannot set bottom margin to a negative value:" << bottom; - } else { - if (bottom != QMargins::bottom()) { - QMargins::setBottom(bottom); - emit bottomChanged(QMargins::top(), QMargins::bottom(), QMargins::left(), QMargins::right()); - } - } -} - -void DeclarativeMargins::setLeft(int left) -{ - if (left < 0) { - qWarning() << "Cannot set left margin to a negative value:" << left; - } else { - if (left != QMargins::left()) { - QMargins::setLeft(left); - emit leftChanged(QMargins::top(), QMargins::bottom(), QMargins::left(), QMargins::right()); - } - } -} - -void DeclarativeMargins::setRight(int right) -{ - if (right < 0) { - qWarning() << "Cannot set left margin to a negative value:" << right; - } else { - if (right != QMargins::right()) { - QMargins::setRight(right); - emit rightChanged(QMargins::top(), QMargins::bottom(), QMargins::left(), QMargins::right()); - } - } -} - -#include "moc_declarativemargins.cpp" - -QTCOMMERCIALCHART_END_NAMESPACE |