diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | src/controls/controls.pro | 5 | ||||
| -rw-r--r-- | src/controls/qquickcolorimageprovider_p.h | 3 | ||||
| -rw-r--r-- | src/controls/qquickpaddedrectangle_p.h | 3 | ||||
| -rw-r--r-- | src/controls/qquickproxytheme_p.h | 3 | ||||
| -rw-r--r-- | src/controls/qquickstyleattached_p.h | 3 | ||||
| -rw-r--r-- | src/controls/qquickstyleselector_p.h | 4 | ||||
| -rw-r--r-- | src/controls/qtlabscontrolsglobal.h | 56 | ||||
| -rw-r--r-- | src/controls/qtlabscontrolsglobal_p.h | 44 |
9 files changed, 117 insertions, 7 deletions
@@ -33,7 +33,6 @@ /tests/auto/snippets/screenshots/*.png /tests/manual/gifs/gifs/*.gif -/src/templates/QtLabsTemplates.version *.so *.so.* @@ -112,3 +111,5 @@ android-*.so-deployment-settings.json *.xcscheme *.xcodeproj qt.conf +*.version +*.version.in diff --git a/src/controls/controls.pro b/src/controls/controls.pro index cb9a8683..953ca1ae 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -1,11 +1,14 @@ TARGET = QtLabsControls MODULE = labscontrols -CONFIG += static internal_module QT += quick QT_PRIVATE += core-private gui-private qml-private quick-private labstemplates-private DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII +HEADERS += \ + $$PWD/qtlabscontrolsglobal.h + $$PWD/qtlabscontrolsglobal_p.h + include(controls.pri) load(qt_module) diff --git a/src/controls/qquickcolorimageprovider_p.h b/src/controls/qquickcolorimageprovider_p.h index 6f55f75f..f50668f8 100644 --- a/src/controls/qquickcolorimageprovider_p.h +++ b/src/controls/qquickcolorimageprovider_p.h @@ -49,10 +49,11 @@ // #include <QtQuick/qquickimageprovider.h> +#include <QtLabsControls/private/qtlabscontrolsglobal_p.h> QT_BEGIN_NAMESPACE -class QQuickColorImageProvider : public QQuickImageProvider +class Q_LABSCONTROLS_PRIVATE_EXPORT QQuickColorImageProvider : public QQuickImageProvider { public: QQuickColorImageProvider(const QString &path); diff --git a/src/controls/qquickpaddedrectangle_p.h b/src/controls/qquickpaddedrectangle_p.h index 690448d6..22cd54f4 100644 --- a/src/controls/qquickpaddedrectangle_p.h +++ b/src/controls/qquickpaddedrectangle_p.h @@ -49,10 +49,11 @@ // #include <QtQuick/private/qquickrectangle_p.h> +#include <QtLabsControls/private/qtlabscontrolsglobal_p.h> QT_BEGIN_NAMESPACE -class QQuickPaddedRectangle : public QQuickRectangle +class Q_LABSCONTROLS_PRIVATE_EXPORT QQuickPaddedRectangle : public QQuickRectangle { Q_OBJECT Q_PROPERTY(qreal padding READ padding WRITE setPadding RESET resetPadding NOTIFY paddingChanged FINAL) diff --git a/src/controls/qquickproxytheme_p.h b/src/controls/qquickproxytheme_p.h index 6d7040e5..f20201ac 100644 --- a/src/controls/qquickproxytheme_p.h +++ b/src/controls/qquickproxytheme_p.h @@ -49,10 +49,11 @@ // #include <QtGui/qpa/qplatformtheme.h> +#include <QtLabsControls/private/qtlabscontrolsglobal_p.h> QT_BEGIN_NAMESPACE -class QQuickProxyTheme : public QPlatformTheme +class Q_LABSCONTROLS_PRIVATE_EXPORT QQuickProxyTheme : public QPlatformTheme { public: QQuickProxyTheme(QPlatformTheme *theme); diff --git a/src/controls/qquickstyleattached_p.h b/src/controls/qquickstyleattached_p.h index 47871d15..591aa133 100644 --- a/src/controls/qquickstyleattached_p.h +++ b/src/controls/qquickstyleattached_p.h @@ -54,12 +54,13 @@ #include <QtCore/qpointer.h> #include <QtCore/qsharedpointer.h> #include <QtQuick/private/qquickitemchangelistener_p.h> +#include <QtLabsControls/private/qtlabscontrolsglobal_p.h> QT_BEGIN_NAMESPACE class QSettings; -class QQuickStyleAttached : public QObject, public QQuickItemChangeListener +class Q_LABSCONTROLS_PRIVATE_EXPORT QQuickStyleAttached : public QObject, public QQuickItemChangeListener { Q_OBJECT diff --git a/src/controls/qquickstyleselector_p.h b/src/controls/qquickstyleselector_p.h index 2ca6ea3a..b68d221e 100644 --- a/src/controls/qquickstyleselector_p.h +++ b/src/controls/qquickstyleselector_p.h @@ -48,11 +48,13 @@ #include <QtCore/qurl.h> #include <QtCore/qscopedpointer.h> +#include <QtLabsControls/private/qtlabscontrolsglobal_p.h> QT_BEGIN_NAMESPACE class QQuickStyleSelectorPrivate; -class QQuickStyleSelector + +class Q_LABSCONTROLS_PRIVATE_EXPORT QQuickStyleSelector { public: explicit QQuickStyleSelector(); diff --git a/src/controls/qtlabscontrolsglobal.h b/src/controls/qtlabscontrolsglobal.h new file mode 100644 index 00000000..08cef64a --- /dev/null +++ b/src/controls/qtlabscontrolsglobal.h @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTLABSCONTROLSSGLOBAL_H +#define QTLABSCONTROLSSGLOBAL_H + +#include <QtCore/qglobal.h> + +QT_BEGIN_NAMESPACE + +#ifndef QT_STATIC +# if defined(QT_BUILD_LABSCONTROLS_LIB) +# define Q_LABSCONTROLS_EXPORT Q_DECL_EXPORT +# else +# define Q_LABSCONTROLS_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_LABSCONTROLS_EXPORT +#endif + +QT_END_NAMESPACE + +#endif // QTLABSCONTROLSSGLOBAL_H diff --git a/src/controls/qtlabscontrolsglobal_p.h b/src/controls/qtlabscontrolsglobal_p.h new file mode 100644 index 00000000..7cf47b5d --- /dev/null +++ b/src/controls/qtlabscontrolsglobal_p.h @@ -0,0 +1,44 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTLABSCONTROLSSGLOBAL_P_H +#define QTLABSCONTROLSSGLOBAL_P_H + +#include <QtLabsControls/qtlabscontrolsglobal.h> + +#define Q_LABSCONTROLS_PRIVATE_EXPORT Q_LABSCONTROLS_EXPORT + +#endif // QTLABSCONTROLSSGLOBAL_P_H |