HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · plugins/declarative/declarativeareaseries.cpp

Fix build for iOS and for building the QtQuick 2 plugin statically...

Fix build for iOS and for building the QtQuick 2 plugin statically When building statically then static will be set not staticlib, therefore we need to ensure we check for static in those cases. And also protect against Mac specific flags when building for iOS. Task-number: QTRD-3036 Change-Id: Ib2c534974ad9292e3634b8b692344c71e26e56cd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2574:599370d0561c


                r2680:743754a36d25

Download file

             declarativeareaseries.cpp
        
                    75 lines
            
             | 2.5 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / plugins / declarative / declarativeareaseries.cpp
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /****************************************************************************

      **

      ** Copyright (C) 2013 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 "declarativeareaseries.h"

      #include "declarativelineseries.h"

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      DeclarativeAreaSeries::DeclarativeAreaSeries(QObject *parent) :

          QAreaSeries(parent),

          m_axes(new DeclarativeAxes(this))

      {

          connect(m_axes, SIGNAL(axisXChanged(QAbstractAxis*)), this, SIGNAL(axisXChanged(QAbstractAxis*)));

          connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis*)), this, SIGNAL(axisYChanged(QAbstractAxis*)));

          connect(m_axes, SIGNAL(axisXTopChanged(QAbstractAxis*)), this, SIGNAL(axisXTopChanged(QAbstractAxis*)));

          connect(m_axes, SIGNAL(axisYRightChanged(QAbstractAxis*)), this, SIGNAL(axisYRightChanged(QAbstractAxis*)));

          connect(m_axes, SIGNAL(axisXChanged(QAbstractAxis*)), this, SIGNAL(axisAngularChanged(QAbstractAxis*)));

          connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis*)), this, SIGNAL(axisRadialChanged(QAbstractAxis*)));

      }

      void DeclarativeAreaSeries::setUpperSeries(DeclarativeLineSeries *series)

      {

          QAreaSeries::setUpperSeries(series);

      }

      DeclarativeLineSeries *DeclarativeAreaSeries::upperSeries() const

      {

          return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::upperSeries());

      }

      void DeclarativeAreaSeries::setLowerSeries(DeclarativeLineSeries *series)

      {

          QAreaSeries::setLowerSeries(series);

      }

      DeclarativeLineSeries *DeclarativeAreaSeries::lowerSeries() const

      {

          return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::lowerSeries());

      }

      qreal DeclarativeAreaSeries::borderWidth() const

      {

          return pen().widthF();

      }

      void DeclarativeAreaSeries::setBorderWidth(qreal width)

      {

          if (width != pen().widthF()) {

              QPen p = pen();

              p.setWidthF(width);

              setPen(p);

              emit borderWidthChanged(width);

          }

      }

      #include "moc_declarativeareaseries.cpp"

      QTCOMMERCIALCHART_END_NAMESPACE

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				/****************************************************************************
				**
				** Copyright (C) 2013 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 "declarativeareaseries.h"
				#include "declarativelineseries.h"

				QTCOMMERCIALCHART_BEGIN_NAMESPACE

				DeclarativeAreaSeries::DeclarativeAreaSeries(QObject *parent) :
				QAreaSeries(parent),
				m_axes(new DeclarativeAxes(this))
				{
				connect(m_axes, SIGNAL(axisXChanged(QAbstractAxis)), this, SIGNAL(axisXChanged(QAbstractAxis)));
				connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis)), this, SIGNAL(axisYChanged(QAbstractAxis)));
				connect(m_axes, SIGNAL(axisXTopChanged(QAbstractAxis)), this, SIGNAL(axisXTopChanged(QAbstractAxis)));
				connect(m_axes, SIGNAL(axisYRightChanged(QAbstractAxis)), this, SIGNAL(axisYRightChanged(QAbstractAxis)));
				connect(m_axes, SIGNAL(axisXChanged(QAbstractAxis)), this, SIGNAL(axisAngularChanged(QAbstractAxis)));
				connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis)), this, SIGNAL(axisRadialChanged(QAbstractAxis)));
				}

				void DeclarativeAreaSeries::setUpperSeries(DeclarativeLineSeries *series)
				{
				QAreaSeries::setUpperSeries(series);
				}

				DeclarativeLineSeries *DeclarativeAreaSeries::upperSeries() const
				{
				return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::upperSeries());
				}

				void DeclarativeAreaSeries::setLowerSeries(DeclarativeLineSeries *series)
				{
				QAreaSeries::setLowerSeries(series);
				}

				DeclarativeLineSeries *DeclarativeAreaSeries::lowerSeries() const
				{
				return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::lowerSeries());
				}

				qreal DeclarativeAreaSeries::borderWidth() const
				{
				return pen().widthF();
				}

				void DeclarativeAreaSeries::setBorderWidth(qreal width)
				{
				if (width != pen().widthF()) {
				QPen p = pen();
				p.setWidthF(width);
				setPen(p);
				emit borderWidthChanged(width);
				}
				}

				#include "moc_declarativeareaseries.cpp"

				QTCOMMERCIALCHART_END_NAMESPACE