HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · demos/quick2chart/qtquick2applicationviewer/qtquick2applicationviewer.cpp

Return empty brush/pen/font via API rather than the weird default one...

Return empty brush/pen/font via API rather than the weird default one Previously a non-initialized QPen()/QBrush()/QFont() was returned if axis/series hadn't been added to a chart yet and therefore had not been themed yet. To keep API somewhat consistent with old behavior, return non-initialized QPen()/QBrush()/QFont() instead of the weird default one in these cases. The new behavior is slightly different in that it is no longer possible to restore themed behavior by setting pen/brush/font to non-initialized one, but since there is no way to differentiate e.g. legitimate Qt::black pen from non-initialized pen, we can no longer support this behavior. Change-Id: I99f3d8853b329b5345e3073c040d8bfa8b9b75b4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2511:5947c46dff64


                r2519:9ea7d7fe3500

Download file

             qtquick2applicationviewer.cpp
        
                    70 lines
            
             | 2.0 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / demos / quick2chart / qtquick2applicationviewer / qtquick2applicationviewer.cpp
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      // checksum 0x56a9 version 0x80001

      /*

        This file was generated by the Qt Quick 2 Application wizard of Qt Creator.

        QtQuick2ApplicationViewer is a convenience class containing mobile device specific

        code such as screen orientation handling. Also QML paths and debugging are

        handled here.

        It is recommended not to modify this file, since newer versions of Qt Creator

        may offer an updated version of it.

      */

      #include "qtquick2applicationviewer.h"

      #include <QtCore/QCoreApplication>

      #include <QtCore/QDir>

      #include <QtQml/QQmlEngine>

      class QtQuick2ApplicationViewerPrivate

      {

          QString mainQmlFile;

          friend class QtQuick2ApplicationViewer;

          static QString adjustPath(const QString &path);

      };

      QString QtQuick2ApplicationViewerPrivate::adjustPath(const QString &path)

      {

      #if defined(Q_OS_MAC)

          if (!QDir::isAbsolutePath(path))

              return QString::fromLatin1("%1/../Resources/%2")

                      .arg(QCoreApplication::applicationDirPath(), path);

      #elif defined(Q_OS_UNIX)

          const QString pathInInstallDir =

                  QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);

          if (QFileInfo(pathInInstallDir).exists())

              return pathInInstallDir;

      #endif

          return path;

      }

      QtQuick2ApplicationViewer::QtQuick2ApplicationViewer(QWindow *parent)

          : QQuickView(parent)

          , d(new QtQuick2ApplicationViewerPrivate())

      {

          connect(engine(), SIGNAL(quit()), SLOT(close()));

          setResizeMode(QQuickView::SizeRootObjectToView);

      }

      QtQuick2ApplicationViewer::~QtQuick2ApplicationViewer()

      {

          delete d;

      }

      void QtQuick2ApplicationViewer::setMainQmlFile(const QString &file)

      {

          d->mainQmlFile = QtQuick2ApplicationViewerPrivate::adjustPath(file);

          setSource(QUrl::fromLocalFile(d->mainQmlFile));

      }

      void QtQuick2ApplicationViewer::addImportPath(const QString &path)

      {

          engine()->addImportPath(QtQuick2ApplicationViewerPrivate::adjustPath(path));

      }

      void QtQuick2ApplicationViewer::showExpanded()

      {

      #if defined(Q_WS_SIMULATOR)

          showFullScreen();

      #else

          show();

      #endif

      }

	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

				// checksum 0x56a9 version 0x80001
				/*
				This file was generated by the Qt Quick 2 Application wizard of Qt Creator.
				QtQuick2ApplicationViewer is a convenience class containing mobile device specific
				code such as screen orientation handling. Also QML paths and debugging are
				handled here.
				It is recommended not to modify this file, since newer versions of Qt Creator
				may offer an updated version of it.
				*/

				#include "qtquick2applicationviewer.h"

				#include <QtCore/QCoreApplication>
				#include <QtCore/QDir>
				#include <QtQml/QQmlEngine>

				class QtQuick2ApplicationViewerPrivate
				{
				QString mainQmlFile;
				friend class QtQuick2ApplicationViewer;
				static QString adjustPath(const QString &path);
				};

				QString QtQuick2ApplicationViewerPrivate::adjustPath(const QString &path)
				{
				#if defined(Q_OS_MAC)
				if (!QDir::isAbsolutePath(path))
				return QString::fromLatin1("%1/../Resources/%2")
				.arg(QCoreApplication::applicationDirPath(), path);
				#elif defined(Q_OS_UNIX)
				const QString pathInInstallDir =
				QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
				if (QFileInfo(pathInInstallDir).exists())
				return pathInInstallDir;
				#endif
				return path;
				}

				QtQuick2ApplicationViewer::QtQuick2ApplicationViewer(QWindow *parent)
				: QQuickView(parent)
				, d(new QtQuick2ApplicationViewerPrivate())
				{
				connect(engine(), SIGNAL(quit()), SLOT(close()));
				setResizeMode(QQuickView::SizeRootObjectToView);
				}

				QtQuick2ApplicationViewer::~QtQuick2ApplicationViewer()
				{
				delete d;
				}

				void QtQuick2ApplicationViewer::setMainQmlFile(const QString &file)
				{
				d->mainQmlFile = QtQuick2ApplicationViewerPrivate::adjustPath(file);
				setSource(QUrl::fromLocalFile(d->mainQmlFile));
				}

				void QtQuick2ApplicationViewer::addImportPath(const QString &path)
				{
				engine()->addImportPath(QtQuick2ApplicationViewerPrivate::adjustPath(path));
				}

				void QtQuick2ApplicationViewer::showExpanded()
				{
				#if defined(Q_WS_SIMULATOR)
				showFullScreen();
				#else
				show();
				#endif
				}