diff options
-rw-r--r-- | src/calendar/calendar.pro | 14 | ||||
-rw-r--r-- | src/calendar/qtquickcalendarglobal_p.h | 67 | ||||
-rw-r--r-- | src/imports/calendar/calendar.pri (renamed from src/calendar/calendar.pri) | 5 | ||||
-rw-r--r-- | src/imports/calendar/calendar.pro | 13 | ||||
-rw-r--r-- | src/imports/calendar/qquickcalendarmodel.cpp (renamed from src/calendar/qquickcalendarmodel.cpp) | 0 | ||||
-rw-r--r-- | src/imports/calendar/qquickcalendarmodel_p.h (renamed from src/calendar/qquickcalendarmodel_p.h) | 3 | ||||
-rw-r--r-- | src/imports/calendar/qquickcalendarview.cpp (renamed from src/calendar/qquickcalendarview.cpp) | 0 | ||||
-rw-r--r-- | src/imports/calendar/qquickcalendarview_p.h (renamed from src/calendar/qquickcalendarview_p.h) | 3 | ||||
-rw-r--r-- | src/imports/calendar/qquickdayofweekmodel.cpp (renamed from src/calendar/qquickdayofweekmodel.cpp) | 0 | ||||
-rw-r--r-- | src/imports/calendar/qquickdayofweekmodel_p.h (renamed from src/calendar/qquickdayofweekmodel_p.h) | 3 | ||||
-rw-r--r-- | src/imports/calendar/qquickdayofweekrow.cpp (renamed from src/calendar/qquickdayofweekrow.cpp) | 0 | ||||
-rw-r--r-- | src/imports/calendar/qquickdayofweekrow_p.h (renamed from src/calendar/qquickdayofweekrow_p.h) | 3 | ||||
-rw-r--r-- | src/imports/calendar/qquickmonthmodel.cpp (renamed from src/calendar/qquickmonthmodel.cpp) | 0 | ||||
-rw-r--r-- | src/imports/calendar/qquickmonthmodel_p.h (renamed from src/calendar/qquickmonthmodel_p.h) | 3 | ||||
-rw-r--r-- | src/imports/calendar/qquickweeknumbercolumn.cpp (renamed from src/calendar/qquickweeknumbercolumn.cpp) | 0 | ||||
-rw-r--r-- | src/imports/calendar/qquickweeknumbercolumn_p.h (renamed from src/calendar/qquickweeknumbercolumn_p.h) | 3 | ||||
-rw-r--r-- | src/imports/calendar/qquickweeknumbermodel.cpp (renamed from src/calendar/qquickweeknumbermodel.cpp) | 0 | ||||
-rw-r--r-- | src/imports/calendar/qquickweeknumbermodel_p.h (renamed from src/calendar/qquickweeknumbermodel_p.h) | 3 | ||||
-rw-r--r-- | src/imports/calendar/qtquickcalendar2plugin.cpp | 14 | ||||
-rw-r--r-- | src/src.pro | 4 | ||||
-rw-r--r-- | sync.profile | 1 |
21 files changed, 26 insertions, 113 deletions
diff --git a/src/calendar/calendar.pro b/src/calendar/calendar.pro deleted file mode 100644 index b357b504..00000000 --- a/src/calendar/calendar.pro +++ /dev/null @@ -1,14 +0,0 @@ -TARGET = QtQuickCalendar -MODULE = quickcalendar2 -CONFIG += internal_module - -QT += quick -QT += core-private gui-private qml-private quick-private quickcontrols2-private - -DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII - -HEADERS += \ - $$PWD/qtquickcalendarglobal_p.h - -include(calendar.pri) -load(qt_module) diff --git a/src/calendar/qtquickcalendarglobal_p.h b/src/calendar/qtquickcalendarglobal_p.h deleted file mode 100644 index d5da61f1..00000000 --- a/src/calendar/qtquickcalendarglobal_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Calendar 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 QTQUICKCALENDARGLOBAL_P_H -#define QTQUICKCALENDARGLOBAL_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <QtCore/qglobal.h> - -QT_BEGIN_NAMESPACE - -#ifndef QT_STATIC -# if defined(QT_BUILD_QUICKCALENDAR2_LIB) -# define Q_QUICKCALENDAR_EXPORT Q_DECL_EXPORT -# else -# define Q_QUICKCALENDAR_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_QUICKCALENDAR_EXPORT -#endif - -QT_END_NAMESPACE - -#endif // QTQUICKCALENDARGLOBAL_P_H diff --git a/src/calendar/calendar.pri b/src/imports/calendar/calendar.pri index 1e1f4107..9fc4d94f 100644 --- a/src/calendar/calendar.pri +++ b/src/imports/calendar/calendar.pri @@ -1,4 +1,7 @@ -INCLUDEPATH += $$PWD +QML_FILES = \ + CalendarView.qml \ + DayOfWeekRow.qml \ + WeekNumberColumn.qml HEADERS += \ $$PWD/qquickcalendarmodel_p.h \ diff --git a/src/imports/calendar/calendar.pro b/src/imports/calendar/calendar.pro index b8318672..f7fc993b 100644 --- a/src/imports/calendar/calendar.pro +++ b/src/imports/calendar/calendar.pro @@ -3,18 +3,19 @@ TARGETPATH = QtQuick/Calendar.2 IMPORT_VERSION = 2.0 QT += qml quick -QT += core-private gui-private qml-private quick-private quickcontrols2-private quickcalendar2-private +QT += core-private gui-private qml-private quick-private quickcontrols2-private + +DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII + +INCLUDEPATH += $$PWD OTHER_FILES += \ qmldir -QML_FILES = \ - CalendarView.qml \ - DayOfWeekRow.qml \ - WeekNumberColumn.qml - SOURCES += \ $$PWD/qtquickcalendar2plugin.cpp +include(calendar.pri) + CONFIG += no_cxx_module load(qml_plugin) diff --git a/src/calendar/qquickcalendarmodel.cpp b/src/imports/calendar/qquickcalendarmodel.cpp index c1386ed0..c1386ed0 100644 --- a/src/calendar/qquickcalendarmodel.cpp +++ b/src/imports/calendar/qquickcalendarmodel.cpp diff --git a/src/calendar/qquickcalendarmodel_p.h b/src/imports/calendar/qquickcalendarmodel_p.h index 429026ee..2501acfb 100644 --- a/src/calendar/qquickcalendarmodel_p.h +++ b/src/imports/calendar/qquickcalendarmodel_p.h @@ -51,13 +51,12 @@ #include <QtCore/qabstractitemmodel.h> #include <QtCore/qdatetime.h> #include <QtQml/qqmlparserstatus.h> -#include <QtQuickCalendar/private/qtquickcalendarglobal_p.h> QT_BEGIN_NAMESPACE class QQuickCalendarModelPrivate; -class Q_QUICKCALENDAR_EXPORT QQuickCalendarModel : public QAbstractListModel, public QQmlParserStatus +class QQuickCalendarModel : public QAbstractListModel, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/calendar/qquickcalendarview.cpp b/src/imports/calendar/qquickcalendarview.cpp index bdc67d43..bdc67d43 100644 --- a/src/calendar/qquickcalendarview.cpp +++ b/src/imports/calendar/qquickcalendarview.cpp diff --git a/src/calendar/qquickcalendarview_p.h b/src/imports/calendar/qquickcalendarview_p.h index b116738b..b6094da1 100644 --- a/src/calendar/qquickcalendarview_p.h +++ b/src/imports/calendar/qquickcalendarview_p.h @@ -48,7 +48,6 @@ // We mean it. // -#include <QtQuickCalendar/private/qtquickcalendarglobal_p.h> #include <QtQuickControls/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE @@ -56,7 +55,7 @@ QT_BEGIN_NAMESPACE class QQmlComponent; class QQuickCalendarViewPrivate; -class Q_QUICKCALENDAR_EXPORT QQuickCalendarView : public QQuickControl +class QQuickCalendarView : public QQuickControl { Q_OBJECT Q_PROPERTY(int month READ month WRITE setMonth NOTIFY monthChanged FINAL) diff --git a/src/calendar/qquickdayofweekmodel.cpp b/src/imports/calendar/qquickdayofweekmodel.cpp index 7f75f784..7f75f784 100644 --- a/src/calendar/qquickdayofweekmodel.cpp +++ b/src/imports/calendar/qquickdayofweekmodel.cpp diff --git a/src/calendar/qquickdayofweekmodel_p.h b/src/imports/calendar/qquickdayofweekmodel_p.h index d5aaeffe..4e827ad9 100644 --- a/src/calendar/qquickdayofweekmodel_p.h +++ b/src/imports/calendar/qquickdayofweekmodel_p.h @@ -50,13 +50,12 @@ #include <QtCore/qabstractitemmodel.h> #include <QtCore/qlocale.h> -#include <QtQuickCalendar/private/qtquickcalendarglobal_p.h> QT_BEGIN_NAMESPACE class QQuickDayOfWeekModelPrivate; -class Q_QUICKCALENDAR_EXPORT QQuickDayOfWeekModel : public QAbstractListModel +class QQuickDayOfWeekModel : public QAbstractListModel { Q_OBJECT Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged FINAL) diff --git a/src/calendar/qquickdayofweekrow.cpp b/src/imports/calendar/qquickdayofweekrow.cpp index e4b42302..e4b42302 100644 --- a/src/calendar/qquickdayofweekrow.cpp +++ b/src/imports/calendar/qquickdayofweekrow.cpp diff --git a/src/calendar/qquickdayofweekrow_p.h b/src/imports/calendar/qquickdayofweekrow_p.h index a364fc70..de733812 100644 --- a/src/calendar/qquickdayofweekrow_p.h +++ b/src/imports/calendar/qquickdayofweekrow_p.h @@ -48,7 +48,6 @@ // We mean it. // -#include <QtQuickCalendar/private/qtquickcalendarglobal_p.h> #include <QtQuickControls/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE @@ -56,7 +55,7 @@ QT_BEGIN_NAMESPACE class QQmlComponent; class QQuickDayOfWeekRowPrivate; -class Q_QUICKCALENDAR_EXPORT QQuickDayOfWeekRow : public QQuickControl +class QQuickDayOfWeekRow : public QQuickControl { Q_OBJECT Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged FINAL) diff --git a/src/calendar/qquickmonthmodel.cpp b/src/imports/calendar/qquickmonthmodel.cpp index 064712ca..064712ca 100644 --- a/src/calendar/qquickmonthmodel.cpp +++ b/src/imports/calendar/qquickmonthmodel.cpp diff --git a/src/calendar/qquickmonthmodel_p.h b/src/imports/calendar/qquickmonthmodel_p.h index 3cebac24..da4afcb4 100644 --- a/src/calendar/qquickmonthmodel_p.h +++ b/src/imports/calendar/qquickmonthmodel_p.h @@ -51,13 +51,12 @@ #include <QtCore/qabstractitemmodel.h> #include <QtCore/qdatetime.h> #include <QtCore/qlocale.h> -#include <QtQuickCalendar/private/qtquickcalendarglobal_p.h> QT_BEGIN_NAMESPACE class QQuickMonthModelPrivate; -class Q_QUICKCALENDAR_EXPORT QQuickMonthModel : public QAbstractListModel +class QQuickMonthModel : public QAbstractListModel { Q_OBJECT Q_PROPERTY(int month READ month WRITE setMonth NOTIFY monthChanged FINAL) diff --git a/src/calendar/qquickweeknumbercolumn.cpp b/src/imports/calendar/qquickweeknumbercolumn.cpp index 56c4af97..56c4af97 100644 --- a/src/calendar/qquickweeknumbercolumn.cpp +++ b/src/imports/calendar/qquickweeknumbercolumn.cpp diff --git a/src/calendar/qquickweeknumbercolumn_p.h b/src/imports/calendar/qquickweeknumbercolumn_p.h index 022fe5e2..fc60431c 100644 --- a/src/calendar/qquickweeknumbercolumn_p.h +++ b/src/imports/calendar/qquickweeknumbercolumn_p.h @@ -48,7 +48,6 @@ // We mean it. // -#include <QtQuickCalendar/private/qtquickcalendarglobal_p.h> #include <QtQuickControls/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE @@ -56,7 +55,7 @@ QT_BEGIN_NAMESPACE class QQmlComponent; class QQuickWeekNumberColumnPrivate; -class Q_QUICKCALENDAR_EXPORT QQuickWeekNumberColumn : public QQuickControl +class QQuickWeekNumberColumn : public QQuickControl { Q_OBJECT Q_PROPERTY(int month READ month WRITE setMonth NOTIFY monthChanged FINAL) diff --git a/src/calendar/qquickweeknumbermodel.cpp b/src/imports/calendar/qquickweeknumbermodel.cpp index 34d66202..34d66202 100644 --- a/src/calendar/qquickweeknumbermodel.cpp +++ b/src/imports/calendar/qquickweeknumbermodel.cpp diff --git a/src/calendar/qquickweeknumbermodel_p.h b/src/imports/calendar/qquickweeknumbermodel_p.h index b32a7e0b..2ca706c4 100644 --- a/src/calendar/qquickweeknumbermodel_p.h +++ b/src/imports/calendar/qquickweeknumbermodel_p.h @@ -50,13 +50,12 @@ #include <QtCore/qabstractitemmodel.h> #include <QtCore/qlocale.h> -#include <QtQuickCalendar/private/qtquickcalendarglobal_p.h> QT_BEGIN_NAMESPACE class QQuickWeekNumberModelPrivate; -class Q_QUICKCALENDAR_EXPORT QQuickWeekNumberModel : public QAbstractListModel +class QQuickWeekNumberModel : public QAbstractListModel { Q_OBJECT Q_PROPERTY(int month READ month WRITE setMonth NOTIFY monthChanged FINAL) diff --git a/src/imports/calendar/qtquickcalendar2plugin.cpp b/src/imports/calendar/qtquickcalendar2plugin.cpp index 68ef2ad0..be4bfb19 100644 --- a/src/imports/calendar/qtquickcalendar2plugin.cpp +++ b/src/imports/calendar/qtquickcalendar2plugin.cpp @@ -36,13 +36,13 @@ #include <QtQml/qqmlextensionplugin.h> -#include <QtQuickCalendar/private/qquickcalendarview_p.h> -#include <QtQuickCalendar/private/qquickdayofweekrow_p.h> -#include <QtQuickCalendar/private/qquickweeknumbercolumn_p.h> -#include <QtQuickCalendar/private/qquickcalendarmodel_p.h> -#include <QtQuickCalendar/private/qquickdayofweekmodel_p.h> -#include <QtQuickCalendar/private/qquickmonthmodel_p.h> -#include <QtQuickCalendar/private/qquickweeknumbermodel_p.h> +#include "qquickcalendarview_p.h" +#include "qquickdayofweekrow_p.h" +#include "qquickweeknumbercolumn_p.h" +#include "qquickcalendarmodel_p.h" +#include "qquickdayofweekmodel_p.h" +#include "qquickmonthmodel_p.h" +#include "qquickweeknumbermodel_p.h" QT_BEGIN_NAMESPACE diff --git a/src/src.pro b/src/src.pro index 9ad5f141..cc6f0111 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,10 +1,8 @@ TEMPLATE = subdirs SUBDIRS += \ controls \ - calendar \ extras \ imports -calendar.depends = controls extras.depends = controls -imports.depends = controls calendar extras +imports.depends = controls extras diff --git a/sync.profile b/sync.profile index 4e3c122e..3a80776e 100644 --- a/sync.profile +++ b/sync.profile @@ -1,6 +1,5 @@ %modules = ( # path to module name map "QtQuickControls" => "$basedir/src/controls", - "QtQuickCalendar" => "$basedir/src/calendar", "QtQuickExtras" => "$basedir/src/extras", ); %moduleheaders = ( # restrict the module headers to those found in relative path |