diff --git a/modules/gui/qt/dialogs/dialogs/qml/CustomDialog.qml b/modules/gui/qt/dialogs/dialogs/qml/CustomDialog.qml index 55e4d73b64..80cab1c3b1 100644 --- a/modules/gui/qt/dialogs/dialogs/qml/CustomDialog.qml +++ b/modules/gui/qt/dialogs/dialogs/qml/CustomDialog.qml @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Layouts import org.videolan.vlc 0.1 import "qrc:///style/" diff --git a/modules/gui/qt/dialogs/dialogs/qml/Dialogs.qml b/modules/gui/qt/dialogs/dialogs/qml/Dialogs.qml index 58701ade4f..e08cd096f9 100644 --- a/modules/gui/qt/dialogs/dialogs/qml/Dialogs.qml +++ b/modules/gui/qt/dialogs/dialogs/qml/Dialogs.qml @@ -15,11 +15,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 -import QtGraphicalEffects 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Qt5Compat.GraphicalEffects +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/dialogs/dialogs/qml/ModalDialog.qml b/modules/gui/qt/dialogs/dialogs/qml/ModalDialog.qml index 5033cd5c89..cb7c3f1365 100644 --- a/modules/gui/qt/dialogs/dialogs/qml/ModalDialog.qml +++ b/modules/gui/qt/dialogs/dialogs/qml/ModalDialog.qml @@ -15,11 +15,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 -import QtGraphicalEffects 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Layouts +import Qt5Compat.GraphicalEffects import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/dialogs/dialogs/qml/WindowDialog.qml b/modules/gui/qt/dialogs/dialogs/qml/WindowDialog.qml index e95e56ee8f..48caca51af 100644 --- a/modules/gui/qt/dialogs/dialogs/qml/WindowDialog.qml +++ b/modules/gui/qt/dialogs/dialogs/qml/WindowDialog.qml @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Layouts +import QtQuick.Controls import org.videolan.vlc 0.1 import "qrc:///widgets/" as Widgets diff --git a/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml b/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml index 783cdf3e34..12b4abbe5a 100644 --- a/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml +++ b/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQml.Models import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml b/modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml index 7f6943cf44..a1a291c348 100644 --- a/modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml +++ b/modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml @@ -15,9 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQml.Models import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/dialogs/toolbar/qml/EditorDummyButton.qml b/modules/gui/qt/dialogs/toolbar/qml/EditorDummyButton.qml index 58e10870d9..b600b11bd0 100644 --- a/modules/gui/qt/dialogs/toolbar/qml/EditorDummyButton.qml +++ b/modules/gui/qt/dialogs/toolbar/qml/EditorDummyButton.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/dialogs/toolbar/qml/EditorTabButton.qml b/modules/gui/qt/dialogs/toolbar/qml/EditorTabButton.qml index 8e61afda32..9f1f944566 100644 --- a/modules/gui/qt/dialogs/toolbar/qml/EditorTabButton.qml +++ b/modules/gui/qt/dialogs/toolbar/qml/EditorTabButton.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml b/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml index 0830b7c7b3..f0bd42b4a9 100644 --- a/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml +++ b/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQml.Models import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml b/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml index 4e95bd394f..1514f7d7ba 100644 --- a/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml +++ b/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQml.Models 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQml.Models +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorDialog.qml b/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorDialog.qml index f955bb5ca6..5812f664d3 100644 --- a/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorDialog.qml +++ b/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorDialog.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Layouts import "qrc:///widgets/" as Widgets import "qrc:///style/" diff --git a/modules/gui/qt/maininterface/mainctx.cpp b/modules/gui/qt/maininterface/mainctx.cpp index 8720f0666c..58f18e6ad7 100644 --- a/modules/gui/qt/maininterface/mainctx.cpp +++ b/modules/gui/qt/maininterface/mainctx.cpp @@ -922,12 +922,13 @@ void MainCtx::setAttachedToolTip(QObject *toolTip) // one that is set #ifndef NDEBUG QQmlComponent component(engine); - component.setData(QByteArrayLiteral("import QtQuick 2.12; import QtQuick.Controls 2.12; Item { }"), {}); + component.setData(QByteArrayLiteral("import QtQuick; import QtQuick.Controls; Item { }"), {}); QObject* const obj = component.create(); assert(obj); // Consider disabling setting of custom attached // tooltip if the following assertion fails: - assert(QQmlProperty::read(obj, QStringLiteral("ToolTip.toolTip"), qmlContext(obj)).value() == toolTip); + if (QQmlProperty::read(obj, QStringLiteral("ToolTip.toolTip"), qmlContext(obj)).value() != toolTip) + qmlWarning(obj) << "Could not set self as custom ToolTip!"; obj->deleteLater(); #endif } diff --git a/modules/gui/qt/maininterface/qml/BannerSources.qml b/modules/gui/qt/maininterface/qml/BannerSources.qml index 01fd989f34..2265f9b815 100644 --- a/modules/gui/qt/maininterface/qml/BannerSources.qml +++ b/modules/gui/qt/maininterface/qml/BannerSources.qml @@ -16,13 +16,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 -import QtGraphicalEffects 1.12 -import QtQml.Models 2.12 -import QtQuick.Window 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Layouts +import Qt5Compat.GraphicalEffects +import QtQml.Models +import QtQuick.Window import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/maininterface/qml/MainDisplay.qml b/modules/gui/qt/maininterface/qml/MainDisplay.qml index 05d2ad6d4f..77fb975cc7 100644 --- a/modules/gui/qt/maininterface/qml/MainDisplay.qml +++ b/modules/gui/qt/maininterface/qml/MainDisplay.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtGraphicalEffects 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Qt5Compat.GraphicalEffects import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/maininterface/qml/MainGridView.qml b/modules/gui/qt/maininterface/qml/MainGridView.qml index 16488d6604..9160b2f593 100644 --- a/modules/gui/qt/maininterface/qml/MainGridView.qml +++ b/modules/gui/qt/maininterface/qml/MainGridView.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///widgets/" as Widgets diff --git a/modules/gui/qt/maininterface/qml/MainInterface.qml b/modules/gui/qt/maininterface/qml/MainInterface.qml index 86b03ae822..3b97b5dbd7 100644 --- a/modules/gui/qt/maininterface/qml/MainInterface.qml +++ b/modules/gui/qt/maininterface/qml/MainInterface.qml @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.12 -import QtGraphicalEffects 1.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Window +import Qt5Compat.GraphicalEffects import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/maininterface/qml/MainTableView.qml b/modules/gui/qt/maininterface/qml/MainTableView.qml index 937f0e2cc5..55bf7b9943 100644 --- a/modules/gui/qt/maininterface/qml/MainTableView.qml +++ b/modules/gui/qt/maininterface/qml/MainTableView.qml @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///widgets/" as Widgets import "qrc:///style/" diff --git a/modules/gui/qt/maininterface/qml/MainViewLoader.qml b/modules/gui/qt/maininterface/qml/MainViewLoader.qml index fa2b6eb44d..5d3183bb52 100644 --- a/modules/gui/qt/maininterface/qml/MainViewLoader.qml +++ b/modules/gui/qt/maininterface/qml/MainViewLoader.qml @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQml.Models 2.12 +import QtQuick +import QtQml.Models import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/maininterface/qml/NoMedialibHome.qml b/modules/gui/qt/maininterface/qml/NoMedialibHome.qml index f738aa6409..7d2e174c90 100644 --- a/modules/gui/qt/maininterface/qml/NoMedialibHome.qml +++ b/modules/gui/qt/maininterface/qml/NoMedialibHome.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/medialibrary/qml/ArtistTopBanner.qml b/modules/gui/qt/medialibrary/qml/ArtistTopBanner.qml index fc3535a0f7..a6279c9b7a 100644 --- a/modules/gui/qt/medialibrary/qml/ArtistTopBanner.qml +++ b/modules/gui/qt/medialibrary/qml/ArtistTopBanner.qml @@ -15,11 +15,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 -import QtGraphicalEffects 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQml.Models +import Qt5Compat.GraphicalEffects import org.videolan.medialib 0.1 import org.videolan.controls 0.1 diff --git a/modules/gui/qt/medialibrary/qml/AudioGridItem.qml b/modules/gui/qt/medialibrary/qml/AudioGridItem.qml index 155772217e..89fbbecab8 100644 --- a/modules/gui/qt/medialibrary/qml/AudioGridItem.qml +++ b/modules/gui/qt/medialibrary/qml/AudioGridItem.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/medialibrary/qml/MediaGroupDisplay.qml b/modules/gui/qt/medialibrary/qml/MediaGroupDisplay.qml index 79d95d9451..e0e57f3a23 100644 --- a/modules/gui/qt/medialibrary/qml/MediaGroupDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/MediaGroupDisplay.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/medialibrary/qml/MusicAlbums.qml b/modules/gui/qt/medialibrary/qml/MusicAlbums.qml index 735c9f656f..2e03167d86 100644 --- a/modules/gui/qt/medialibrary/qml/MusicAlbums.qml +++ b/modules/gui/qt/medialibrary/qml/MusicAlbums.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.medialib 0.1 import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/medialibrary/qml/MusicAlbumsDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicAlbumsDisplay.qml index a9d6b43d6d..5772ccf627 100644 --- a/modules/gui/qt/medialibrary/qml/MusicAlbumsDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/MusicAlbumsDisplay.qml @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml b/modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml index 53438ad519..94fae5b0ac 100644 --- a/modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml +++ b/modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQml.Models import org.videolan.medialib 0.1 import org.videolan.controls 0.1 diff --git a/modules/gui/qt/medialibrary/qml/MusicAllArtists.qml b/modules/gui/qt/medialibrary/qml/MusicAllArtists.qml index 02816331f3..bf8d08327f 100644 --- a/modules/gui/qt/medialibrary/qml/MusicAllArtists.qml +++ b/modules/gui/qt/medialibrary/qml/MusicAllArtists.qml @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.medialib 0.1 import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/medialibrary/qml/MusicArtist.qml b/modules/gui/qt/medialibrary/qml/MusicArtist.qml index f3b4d3442c..63f689ae5b 100644 --- a/modules/gui/qt/medialibrary/qml/MusicArtist.qml +++ b/modules/gui/qt/medialibrary/qml/MusicArtist.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick.Controls 2.12 -import QtQuick 2.12 -import QtQml.Models 2.12 -import QtQuick.Layouts 1.12 +import QtQuick.Controls +import QtQuick +import QtQml.Models +import QtQuick.Layouts import org.videolan.medialib 0.1 import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml b/modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml index adf5ddb134..fce8e7621b 100644 --- a/modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml +++ b/modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Layouts +import QtQml.Models import org.videolan.medialib 0.1 import org.videolan.controls 0.1 diff --git a/modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml b/modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml index a15dac9a44..5647ef1a17 100644 --- a/modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml +++ b/modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick.Controls 2.12 -import QtQuick 2.12 -import QtQml.Models 2.12 -import QtQuick.Layouts 1.12 +import QtQuick.Controls +import QtQuick +import QtQml.Models +import QtQuick.Layouts import org.videolan.medialib 0.1 import org.videolan.controls 0.1 diff --git a/modules/gui/qt/medialibrary/qml/MusicArtistsDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicArtistsDisplay.qml index 750fadc57d..5af0521ecc 100644 --- a/modules/gui/qt/medialibrary/qml/MusicArtistsDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/MusicArtistsDisplay.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick.Controls 2.12 -import QtQuick 2.12 -import QtQml.Models 2.12 -import QtQuick.Layouts 1.12 +import QtQuick.Controls +import QtQuick +import QtQml.Models +import QtQuick.Layouts import org.videolan.medialib 0.1 import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/medialibrary/qml/MusicDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicDisplay.qml index e3d753924a..8a000d45a4 100644 --- a/modules/gui/qt/medialibrary/qml/MusicDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/MusicDisplay.qml @@ -15,9 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/medialibrary/qml/MusicGenres.qml b/modules/gui/qt/medialibrary/qml/MusicGenres.qml index 5715ae23dd..d8df2e67c6 100644 --- a/modules/gui/qt/medialibrary/qml/MusicGenres.qml +++ b/modules/gui/qt/medialibrary/qml/MusicGenres.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQml.Models import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/medialibrary/qml/MusicGenresDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicGenresDisplay.qml index 0561489a85..9ef062ea53 100644 --- a/modules/gui/qt/medialibrary/qml/MusicGenresDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/MusicGenresDisplay.qml @@ -15,9 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQml.Models import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/medialibrary/qml/MusicPlaylistsDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicPlaylistsDisplay.qml index 0cad675788..3d6bc1d435 100644 --- a/modules/gui/qt/medialibrary/qml/MusicPlaylistsDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/MusicPlaylistsDisplay.qml @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQml.Models import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml index 8491bd8093..75de93cf0f 100644 --- a/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQml.Models 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQml.Models +import QtQuick.Layouts import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml index 6fed31355f..d41eef3317 100644 --- a/modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import org.videolan.medialib 0.1 import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/medialibrary/qml/PlaylistMedia.qml b/modules/gui/qt/medialibrary/qml/PlaylistMedia.qml index 40ddba7623..46c5883582 100644 --- a/modules/gui/qt/medialibrary/qml/PlaylistMedia.qml +++ b/modules/gui/qt/medialibrary/qml/PlaylistMedia.qml @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQml.Models import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml b/modules/gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml index bff827b642..cd56135b63 100644 --- a/modules/gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/PlaylistMediaDisplay.qml @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQml.Models import org.videolan.medialib 0.1 import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml b/modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml index 11f4eda0da..278250db8b 100644 --- a/modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml +++ b/modules/gui/qt/medialibrary/qml/PlaylistMediaList.qml @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQml.Models import org.videolan.medialib 0.1 import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/medialibrary/qml/UrlListDisplay.qml b/modules/gui/qt/medialibrary/qml/UrlListDisplay.qml index b7390f9b98..74da425be0 100644 --- a/modules/gui/qt/medialibrary/qml/UrlListDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/UrlListDisplay.qml @@ -16,9 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQml.Models import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/medialibrary/qml/VideoAll.qml b/modules/gui/qt/medialibrary/qml/VideoAll.qml index 8d670f5a30..7a779c8491 100644 --- a/modules/gui/qt/medialibrary/qml/VideoAll.qml +++ b/modules/gui/qt/medialibrary/qml/VideoAll.qml @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQml.Models import org.videolan.medialib 0.1 import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/medialibrary/qml/VideoAllDisplay.qml b/modules/gui/qt/medialibrary/qml/VideoAllDisplay.qml index 2da045542a..a455847395 100644 --- a/modules/gui/qt/medialibrary/qml/VideoAllDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/VideoAllDisplay.qml @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQml.Models import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/medialibrary/qml/VideoAllSubDisplay.qml b/modules/gui/qt/medialibrary/qml/VideoAllSubDisplay.qml index 8f78559520..e57d1d1ab3 100644 --- a/modules/gui/qt/medialibrary/qml/VideoAllSubDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/VideoAllSubDisplay.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/medialibrary/qml/VideoDisplay.qml b/modules/gui/qt/medialibrary/qml/VideoDisplay.qml index 313b4a3d6e..f62e55b787 100644 --- a/modules/gui/qt/medialibrary/qml/VideoDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/VideoDisplay.qml @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQml.Models import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/medialibrary/qml/VideoGridDisplay.qml b/modules/gui/qt/medialibrary/qml/VideoGridDisplay.qml index 1e40638c3d..6f2c5357c6 100644 --- a/modules/gui/qt/medialibrary/qml/VideoGridDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/VideoGridDisplay.qml @@ -17,9 +17,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQml.Models import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/medialibrary/qml/VideoGridItem.qml b/modules/gui/qt/medialibrary/qml/VideoGridItem.qml index 5b37ab0997..ffff0e563a 100644 --- a/modules/gui/qt/medialibrary/qml/VideoGridItem.qml +++ b/modules/gui/qt/medialibrary/qml/VideoGridItem.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml b/modules/gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml index 1780b05c44..3495fcafce 100644 --- a/modules/gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml +++ b/modules/gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQml.Models 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQml.Models +import QtQuick.Layouts import org.videolan.medialib 0.1 import org.videolan.controls 0.1 diff --git a/modules/gui/qt/medialibrary/qml/VideoListDisplay.qml b/modules/gui/qt/medialibrary/qml/VideoListDisplay.qml index 9f643d6f41..9022eb736a 100644 --- a/modules/gui/qt/medialibrary/qml/VideoListDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/VideoListDisplay.qml @@ -15,9 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQml.Models import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/medialibrary/qml/VideoPlaylistsDisplay.qml b/modules/gui/qt/medialibrary/qml/VideoPlaylistsDisplay.qml index 91649a0a28..b6669675b2 100644 --- a/modules/gui/qt/medialibrary/qml/VideoPlaylistsDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/VideoPlaylistsDisplay.qml @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQml.Models import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/medialibrary/qml/VideoRecentVideos.qml b/modules/gui/qt/medialibrary/qml/VideoRecentVideos.qml index 2757bd0897..8a350e57e5 100644 --- a/modules/gui/qt/medialibrary/qml/VideoRecentVideos.qml +++ b/modules/gui/qt/medialibrary/qml/VideoRecentVideos.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQml.Models import org.videolan.medialib 0.1 import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/medialibrary/qml/VideoRecentVideosDisplay.qml b/modules/gui/qt/medialibrary/qml/VideoRecentVideosDisplay.qml index 5be38d13e0..df91664c0f 100644 --- a/modules/gui/qt/medialibrary/qml/VideoRecentVideosDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/VideoRecentVideosDisplay.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/menus/qml/GlobalShortcuts.qml b/modules/gui/qt/menus/qml/GlobalShortcuts.qml index 2ee4a12d4a..10120bd225 100644 --- a/modules/gui/qt/menus/qml/GlobalShortcuts.qml +++ b/modules/gui/qt/menus/qml/GlobalShortcuts.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/menus/qml/GlobalShortcutsMedialib.qml b/modules/gui/qt/menus/qml/GlobalShortcutsMedialib.qml index ce9ff75e8d..634423c419 100644 --- a/modules/gui/qt/menus/qml/GlobalShortcutsMedialib.qml +++ b/modules/gui/qt/menus/qml/GlobalShortcutsMedialib.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/menus/qml/Menubar.qml b/modules/gui/qt/menus/qml/Menubar.qml index 3a17ffc197..67dd704fe1 100644 --- a/modules/gui/qt/menus/qml/Menubar.qml +++ b/modules/gui/qt/menus/qml/Menubar.qml @@ -15,12 +15,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T import org.videolan.vlc 0.1 -import QtQuick.Layouts 1.12 +import QtQuick.Layouts import "qrc:///style/" diff --git a/modules/gui/qt/menus/qml/ShortcutExt.qml b/modules/gui/qt/menus/qml/ShortcutExt.qml index 25b42a08e1..7c114025b5 100644 --- a/modules/gui/qt/menus/qml/ShortcutExt.qml +++ b/modules/gui/qt/menus/qml/ShortcutExt.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/network/qml/AddressbarButton.qml b/modules/gui/qt/network/qml/AddressbarButton.qml index b9936659ac..5447a3b7cc 100644 --- a/modules/gui/qt/network/qml/AddressbarButton.qml +++ b/modules/gui/qt/network/qml/AddressbarButton.qml @@ -16,8 +16,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import org.videolan.vlc 0.1 import "qrc:///style/" diff --git a/modules/gui/qt/network/qml/BrowseDeviceView.qml b/modules/gui/qt/network/qml/BrowseDeviceView.qml index dad7f52ac1..86d4dc30d2 100644 --- a/modules/gui/qt/network/qml/BrowseDeviceView.qml +++ b/modules/gui/qt/network/qml/BrowseDeviceView.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/network/qml/BrowseDisplay.qml b/modules/gui/qt/network/qml/BrowseDisplay.qml index ee20e7b529..fbb79d8452 100644 --- a/modules/gui/qt/network/qml/BrowseDisplay.qml +++ b/modules/gui/qt/network/qml/BrowseDisplay.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQml.Models 2.12 -import QtQml 2.11 +import QtQuick +import QtQuick.Controls +import QtQml.Models +import QtQml import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/network/qml/BrowseHomeDisplay.qml b/modules/gui/qt/network/qml/BrowseHomeDisplay.qml index 34327e936d..291694e29e 100644 --- a/modules/gui/qt/network/qml/BrowseHomeDisplay.qml +++ b/modules/gui/qt/network/qml/BrowseHomeDisplay.qml @@ -15,11 +15,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQml.Models 2.12 -import QtQml 2.11 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQml.Models +import QtQml import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/network/qml/BrowseTreeDisplay.qml b/modules/gui/qt/network/qml/BrowseTreeDisplay.qml index 4a947d40fa..ca1e658008 100644 --- a/modules/gui/qt/network/qml/BrowseTreeDisplay.qml +++ b/modules/gui/qt/network/qml/BrowseTreeDisplay.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/network/qml/BrowseTreeHeader.qml b/modules/gui/qt/network/qml/BrowseTreeHeader.qml index 167e623d59..dc3d1bf193 100644 --- a/modules/gui/qt/network/qml/BrowseTreeHeader.qml +++ b/modules/gui/qt/network/qml/BrowseTreeHeader.qml @@ -17,9 +17,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Layouts 1.11 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Layouts +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/network/qml/DiscoverDisplay.qml b/modules/gui/qt/network/qml/DiscoverDisplay.qml index 0599c76999..f4239f3cbe 100644 --- a/modules/gui/qt/network/qml/DiscoverDisplay.qml +++ b/modules/gui/qt/network/qml/DiscoverDisplay.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQml.Models 2.12 -import QtQml 2.11 +import QtQuick +import QtQuick.Controls +import QtQml.Models +import QtQml import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/network/qml/DiscoverUrlDisplay.qml b/modules/gui/qt/network/qml/DiscoverUrlDisplay.qml index 54686c2776..b68a8036aa 100644 --- a/modules/gui/qt/network/qml/DiscoverUrlDisplay.qml +++ b/modules/gui/qt/network/qml/DiscoverUrlDisplay.qml @@ -15,9 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQml.Models import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/network/qml/NetworkAddressbar.qml b/modules/gui/qt/network/qml/NetworkAddressbar.qml index 063fa04545..e9990b8cb2 100644 --- a/modules/gui/qt/network/qml/NetworkAddressbar.qml +++ b/modules/gui/qt/network/qml/NetworkAddressbar.qml @@ -15,9 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/network/qml/NetworkCustomCover.qml b/modules/gui/qt/network/qml/NetworkCustomCover.qml index 3a345f968e..1dcc929110 100644 --- a/modules/gui/qt/network/qml/NetworkCustomCover.qml +++ b/modules/gui/qt/network/qml/NetworkCustomCover.qml @@ -15,9 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtGraphicalEffects 1.12 +import QtQuick +import QtQuick.Controls +import Qt5Compat.GraphicalEffects import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/network/qml/NetworkGridItem.qml b/modules/gui/qt/network/qml/NetworkGridItem.qml index dd54e6adde..dd266783e9 100644 --- a/modules/gui/qt/network/qml/NetworkGridItem.qml +++ b/modules/gui/qt/network/qml/NetworkGridItem.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQml.Models 2.12 -import QtGraphicalEffects 1.12 +import QtQuick +import QtQuick.Controls +import QtQml.Models +import Qt5Compat.GraphicalEffects import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/network/qml/NetworkThumbnailItem.qml b/modules/gui/qt/network/qml/NetworkThumbnailItem.qml index 29058eebd3..a062f63423 100644 --- a/modules/gui/qt/network/qml/NetworkThumbnailItem.qml +++ b/modules/gui/qt/network/qml/NetworkThumbnailItem.qml @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQml.Models 2.12 -import QtGraphicalEffects 1.12 +import QtQuick +import QtQuick.Controls +import QtQml.Models +import Qt5Compat.GraphicalEffects import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/network/qml/ServicesHomeDisplay.qml b/modules/gui/qt/network/qml/ServicesHomeDisplay.qml index a999e52f40..1d43a29df9 100644 --- a/modules/gui/qt/network/qml/ServicesHomeDisplay.qml +++ b/modules/gui/qt/network/qml/ServicesHomeDisplay.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQml.Models 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQml.Models +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/network/qml/ServicesManage.qml b/modules/gui/qt/network/qml/ServicesManage.qml index 0c2b14702a..6999633c02 100644 --- a/modules/gui/qt/network/qml/ServicesManage.qml +++ b/modules/gui/qt/network/qml/ServicesManage.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/network/qml/ServicesSources.qml b/modules/gui/qt/network/qml/ServicesSources.qml index 12c756b6c2..6824446fee 100644 --- a/modules/gui/qt/network/qml/ServicesSources.qml +++ b/modules/gui/qt/network/qml/ServicesSources.qml @@ -15,9 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/pixmaps/makeIconFont.py b/modules/gui/qt/pixmaps/makeIconFont.py index 683826d124..3586428924 100755 --- a/modules/gui/qt/pixmaps/makeIconFont.py +++ b/modules/gui/qt/pixmaps/makeIconFont.py @@ -47,7 +47,7 @@ QML_TEMPLATE=u""" * This file was generated by makeIconFont.py, please do not edit by hand */ pragma Singleton -import QtQuick 2.12 +import QtQuick QtObject { readonly property FontLoader fontLoader : FontLoader { diff --git a/modules/gui/qt/player/qml/Bookmarks.qml b/modules/gui/qt/player/qml/Bookmarks.qml index fe7730b3e0..2ea2cc01f0 100644 --- a/modules/gui/qt/player/qml/Bookmarks.qml +++ b/modules/gui/qt/player/qml/Bookmarks.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/player/qml/ControlBar.qml b/modules/gui/qt/player/qml/ControlBar.qml index 6638146127..195185cd0f 100644 --- a/modules/gui/qt/player/qml/ControlBar.qml +++ b/modules/gui/qt/player/qml/ControlBar.qml @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Layouts +import QtQml.Models import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/ControlLayout.qml b/modules/gui/qt/player/qml/ControlLayout.qml index 603456b263..e3ef09d99d 100644 --- a/modules/gui/qt/player/qml/ControlLayout.qml +++ b/modules/gui/qt/player/qml/ControlLayout.qml @@ -15,11 +15,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Layouts +import QtQml.Models import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/ControlRepeater.qml b/modules/gui/qt/player/qml/ControlRepeater.qml index 3720f24905..871af0ee60 100644 --- a/modules/gui/qt/player/qml/ControlRepeater.qml +++ b/modules/gui/qt/player/qml/ControlRepeater.qml @@ -15,9 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/ControlbarControls.qml b/modules/gui/qt/player/qml/ControlbarControls.qml index 156ccf5578..b6e60abccb 100644 --- a/modules/gui/qt/player/qml/ControlbarControls.qml +++ b/modules/gui/qt/player/qml/ControlbarControls.qml @@ -18,7 +18,7 @@ pragma Singleton -import QtQml 2.11 +import QtQml import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/MiniPlayer.qml b/modules/gui/qt/player/qml/MiniPlayer.qml index 3e06c5e4fd..b987207ca6 100644 --- a/modules/gui/qt/player/qml/MiniPlayer.qml +++ b/modules/gui/qt/player/qml/MiniPlayer.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/NavigationBox.qml b/modules/gui/qt/player/qml/NavigationBox.qml index b3149982e9..37746475fe 100644 --- a/modules/gui/qt/player/qml/NavigationBox.qml +++ b/modules/gui/qt/player/qml/NavigationBox.qml @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/PIPPlayer.qml b/modules/gui/qt/player/qml/PIPPlayer.qml index d9fb82d92c..7cc6011c73 100644 --- a/modules/gui/qt/player/qml/PIPPlayer.qml +++ b/modules/gui/qt/player/qml/PIPPlayer.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import org.videolan.vlc 0.1 import "qrc:///style/" diff --git a/modules/gui/qt/player/qml/PlaybackSpeed.qml b/modules/gui/qt/player/qml/PlaybackSpeed.qml index eef13e0b24..ba93706913 100644 --- a/modules/gui/qt/player/qml/PlaybackSpeed.qml +++ b/modules/gui/qt/player/qml/PlaybackSpeed.qml @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/Player.qml b/modules/gui/qt/player/qml/Player.qml index 2e19a37046..685d5e9351 100644 --- a/modules/gui/qt/player/qml/Player.qml +++ b/modules/gui/qt/player/qml/Player.qml @@ -15,12 +15,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 -import QtGraphicalEffects 1.12 -import QtQuick.Window 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQml.Models +import Qt5Compat.GraphicalEffects +import QtQuick.Window import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/PlayerBlurredBackground.qml b/modules/gui/qt/player/qml/PlayerBlurredBackground.qml index ee810e2e31..78653116b7 100644 --- a/modules/gui/qt/player/qml/PlayerBlurredBackground.qml +++ b/modules/gui/qt/player/qml/PlayerBlurredBackground.qml @@ -16,9 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtGraphicalEffects 1.12 +import QtQuick + +import Qt5Compat.GraphicalEffects Item { id: rootItem diff --git a/modules/gui/qt/player/qml/PlayerControlLayout.qml b/modules/gui/qt/player/qml/PlayerControlLayout.qml index e3c96c509a..6b968b03fd 100644 --- a/modules/gui/qt/player/qml/PlayerControlLayout.qml +++ b/modules/gui/qt/player/qml/PlayerControlLayout.qml @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/PlayerPlaylistVisibilityFSM.qml b/modules/gui/qt/player/qml/PlayerPlaylistVisibilityFSM.qml index e4f7b1afa8..3011b3e2ec 100644 --- a/modules/gui/qt/player/qml/PlayerPlaylistVisibilityFSM.qml +++ b/modules/gui/qt/player/qml/PlayerPlaylistVisibilityFSM.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 import "qrc:///util/" as Util diff --git a/modules/gui/qt/player/qml/ResumeDialog.qml b/modules/gui/qt/player/qml/ResumeDialog.qml index bc21a489ca..af2d6fbfef 100644 --- a/modules/gui/qt/player/qml/ResumeDialog.qml +++ b/modules/gui/qt/player/qml/ResumeDialog.qml @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/SliderBar.qml b/modules/gui/qt/player/qml/SliderBar.qml index 0ac06b4b46..e6e6a53c0d 100644 --- a/modules/gui/qt/player/qml/SliderBar.qml +++ b/modules/gui/qt/player/qml/SliderBar.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtGraphicalEffects 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Qt5Compat.GraphicalEffects import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/TopBar.qml b/modules/gui/qt/player/qml/TopBar.qml index 99cceb2a82..4d0923c7b0 100644 --- a/modules/gui/qt/player/qml/TopBar.qml +++ b/modules/gui/qt/player/qml/TopBar.qml @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 -import QtQuick.Window 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Layouts +import QtQuick.Window import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/TracksListPage.qml b/modules/gui/qt/player/qml/TracksListPage.qml index eb82054dc2..0fe267adc5 100644 --- a/modules/gui/qt/player/qml/TracksListPage.qml +++ b/modules/gui/qt/player/qml/TracksListPage.qml @@ -16,11 +16,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Layouts +import QtQml.Models import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/TracksMenu.qml b/modules/gui/qt/player/qml/TracksMenu.qml index f5e066d5da..696a7dfc3f 100644 --- a/modules/gui/qt/player/qml/TracksMenu.qml +++ b/modules/gui/qt/player/qml/TracksMenu.qml @@ -16,11 +16,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Layouts +import QtQml.Models import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/TracksPage.qml b/modules/gui/qt/player/qml/TracksPage.qml index 25ce3ade04..5db99a4abd 100644 --- a/modules/gui/qt/player/qml/TracksPage.qml +++ b/modules/gui/qt/player/qml/TracksPage.qml @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/TracksPageAudio.qml b/modules/gui/qt/player/qml/TracksPageAudio.qml index a6009cba80..be27ae311a 100644 --- a/modules/gui/qt/player/qml/TracksPageAudio.qml +++ b/modules/gui/qt/player/qml/TracksPageAudio.qml @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/TracksPageSpeed.qml b/modules/gui/qt/player/qml/TracksPageSpeed.qml index 74d7cd9692..f5f151a4d7 100644 --- a/modules/gui/qt/player/qml/TracksPageSpeed.qml +++ b/modules/gui/qt/player/qml/TracksPageSpeed.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/TracksPageSubtitle.qml b/modules/gui/qt/player/qml/TracksPageSubtitle.qml index c21bf702fd..911826ec88 100644 --- a/modules/gui/qt/player/qml/TracksPageSubtitle.qml +++ b/modules/gui/qt/player/qml/TracksPageSubtitle.qml @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml b/modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml index 24fd67f958..93efa4765d 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/AspectRatioWidget.qml b/modules/gui/qt/player/qml/controlbarcontrols/AspectRatioWidget.qml index c2670c4b90..82a191e9f7 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/AspectRatioWidget.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/AspectRatioWidget.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/AtoBButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/AtoBButton.qml index 515f725192..1801220a79 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/AtoBButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/AtoBButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/BackButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/BackButton.qml index e94279b82a..3e35b352fa 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/BackButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/BackButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///widgets/" as Widgets import "qrc:///style/" diff --git a/modules/gui/qt/player/qml/controlbarcontrols/BookmarkButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/BookmarkButton.qml index 636c0e1ac5..bcf30f4b75 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/BookmarkButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/BookmarkButton.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/ChapterNextButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/ChapterNextButton.qml index c83e7ed660..5e61918a38 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/ChapterNextButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/ChapterNextButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/ChapterPreviousButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/ChapterPreviousButton.qml index 4d2fd58542..b1014ff10c 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/ChapterPreviousButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/ChapterPreviousButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/DvdMenuButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/DvdMenuButton.qml index b24701e1e5..af13a56b94 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/DvdMenuButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/DvdMenuButton.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///widgets/" as Widgets import "qrc:///style/" diff --git a/modules/gui/qt/player/qml/controlbarcontrols/ExpandingSpacerWidget.qml b/modules/gui/qt/player/qml/controlbarcontrols/ExpandingSpacerWidget.qml index 280d15ce3e..7d977ef4eb 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/ExpandingSpacerWidget.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/ExpandingSpacerWidget.qml @@ -15,9 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/ExtendedSettingsButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/ExtendedSettingsButton.qml index 243331ff0d..21b80150e7 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/ExtendedSettingsButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/ExtendedSettingsButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/Fallback.qml b/modules/gui/qt/player/qml/controlbarcontrols/Fallback.qml index 4c138a4fb7..9ce7ae5365 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/Fallback.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/Fallback.qml @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtGraphicalEffects 1.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import Qt5Compat.GraphicalEffects import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/FasterButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/FasterButton.qml index 63c5890404..4ffac61ebc 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/FasterButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/FasterButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/FrameButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/FrameButton.qml index e7f177a1cc..cf665bb9f3 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/FrameButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/FrameButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/FullscreenButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/FullscreenButton.qml index 0078e2b481..7d4738f47d 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/FullscreenButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/FullscreenButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/HighResolutionTimeWidget.qml b/modules/gui/qt/player/qml/controlbarcontrols/HighResolutionTimeWidget.qml index e545ea9478..468ac76522 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/HighResolutionTimeWidget.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/HighResolutionTimeWidget.qml @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/InfoButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/InfoButton.qml index db582689da..6aee6b3369 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/InfoButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/InfoButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/LangButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/LangButton.qml index cf4dfea1cf..13655b29ff 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/LangButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/LangButton.qml @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/LoopButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/LoopButton.qml index 8ca1b75ffa..d832e0fbad 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/LoopButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/LoopButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/MenuButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/MenuButton.qml index a907a1f208..c0a6b82e6c 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/MenuButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/MenuButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/NavigationBoxButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/NavigationBoxButton.qml index 7319772f7c..c40a99d5d1 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/NavigationBoxButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/NavigationBoxButton.qml @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///widgets/" as Widgets import "qrc:///style/" diff --git a/modules/gui/qt/player/qml/controlbarcontrols/NavigationWidget.qml b/modules/gui/qt/player/qml/controlbarcontrols/NavigationWidget.qml index 62fd053411..fc29a3ecdb 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/NavigationWidget.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/NavigationWidget.qml @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as Templates +import QtQuick +import QtQuick.Templates as Templates import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/NextButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/NextButton.qml index 4ce32472bf..e1af0cd1fd 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/NextButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/NextButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/OpenButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/OpenButton.qml index 31b1eab06a..901ae959ae 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/OpenButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/OpenButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/PlayButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/PlayButton.qml index c447c8d5c5..275efde19f 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/PlayButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/PlayButton.qml @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/PlaybackSpeedButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/PlaybackSpeedButton.qml index 78296b44ae..75fdcdbad3 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/PlaybackSpeedButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/PlaybackSpeedButton.qml @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/PlayerSwitchButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/PlayerSwitchButton.qml index 6fbdf8ebf8..4a789959c2 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/PlayerSwitchButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/PlayerSwitchButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///widgets/" as Widgets import "qrc:///style/" diff --git a/modules/gui/qt/player/qml/controlbarcontrols/PlaylistButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/PlaylistButton.qml index 98c1fe5de8..8ac361a000 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/PlaylistButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/PlaylistButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/PreviousButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/PreviousButton.qml index 4c3c090d79..5b1971619a 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/PreviousButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/PreviousButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/ProgramButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/ProgramButton.qml index 4006f8a6cb..2868ea474e 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/ProgramButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/ProgramButton.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/QuitButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/QuitButton.qml index ac5d52aa09..2ede3dcc43 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/QuitButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/QuitButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/RandomButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/RandomButton.qml index 18750b29ec..9a31d450ce 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/RandomButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/RandomButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/RecordButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/RecordButton.qml index 8ba4720614..4f370a08e8 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/RecordButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/RecordButton.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/RendererButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/RendererButton.qml index 80bc3dfcc1..c56aabfa43 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/RendererButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/RendererButton.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/ReverseButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/ReverseButton.qml index 750f13ac83..5f1ceca690 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/ReverseButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/ReverseButton.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/SkipBackButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/SkipBackButton.qml index 44cad19f3e..7eca555bd2 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/SkipBackButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/SkipBackButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/SkipForwardButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/SkipForwardButton.qml index 2145cd2706..622b3c5e9a 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/SkipForwardButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/SkipForwardButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/SlowerButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/SlowerButton.qml index 22c33ced21..38e5b33e24 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/SlowerButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/SlowerButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/SnapshotButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/SnapshotButton.qml index c33bf26ecb..f584e30d98 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/SnapshotButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/SnapshotButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/SpacerWidget.qml b/modules/gui/qt/player/qml/controlbarcontrols/SpacerWidget.qml index c4f8eb71ae..6f7c08bcfc 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/SpacerWidget.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/SpacerWidget.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/StopButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/StopButton.qml index f258bd2d26..5e0d9714b7 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/StopButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/StopButton.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/TeletextButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/TeletextButton.qml index e85a1a7d68..f1412a4c3b 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/TeletextButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/TeletextButton.qml @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/TeletextColorButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/TeletextColorButton.qml index 6cfe89b61b..33c05a1c11 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/TeletextColorButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/TeletextColorButton.qml @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import "qrc:///widgets/" as Widgets import "qrc:///style/" diff --git a/modules/gui/qt/player/qml/controlbarcontrols/TeletextWidget.qml b/modules/gui/qt/player/qml/controlbarcontrols/TeletextWidget.qml index 41f22510ed..940d51571e 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/TeletextWidget.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/TeletextWidget.qml @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Layouts +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml b/modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml index 4f1263f60c..d188a953d3 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Templates 2.12 as T -import QtGraphicalEffects 1.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Templates as T +import Qt5Compat.GraphicalEffects import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/playlist/qml/PlaylistDelegate.qml b/modules/gui/qt/playlist/qml/PlaylistDelegate.qml index 2b7ec4c2b0..0cc97976bd 100644 --- a/modules/gui/qt/playlist/qml/PlaylistDelegate.qml +++ b/modules/gui/qt/playlist/qml/PlaylistDelegate.qml @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Layouts +import QtQml.Models import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/playlist/qml/PlaylistDetachedWindow.qml b/modules/gui/qt/playlist/qml/PlaylistDetachedWindow.qml index 31f96a5efb..d6ee13a078 100644 --- a/modules/gui/qt/playlist/qml/PlaylistDetachedWindow.qml +++ b/modules/gui/qt/playlist/qml/PlaylistDetachedWindow.qml @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 +import QtQuick +import QtQuick.Window import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/playlist/qml/PlaylistListView.qml b/modules/gui/qt/playlist/qml/PlaylistListView.qml index d82a7dc6c5..b85daa72f2 100644 --- a/modules/gui/qt/playlist/qml/PlaylistListView.qml +++ b/modules/gui/qt/playlist/qml/PlaylistListView.qml @@ -15,11 +15,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Layouts +import QtQml.Models import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/playlist/qml/PlaylistToolbar.qml b/modules/gui/qt/playlist/qml/PlaylistToolbar.qml index 7f6f87b379..2cf1f0d399 100644 --- a/modules/gui/qt/playlist/qml/PlaylistToolbar.qml +++ b/modules/gui/qt/playlist/qml/PlaylistToolbar.qml @@ -15,9 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/style/AcrylicController.qml b/modules/gui/qt/style/AcrylicController.qml index 0604cd23d6..e77970c646 100644 --- a/modules/gui/qt/style/AcrylicController.qml +++ b/modules/gui/qt/style/AcrylicController.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ pragma Singleton -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/style/VLCIcons.qml b/modules/gui/qt/style/VLCIcons.qml index 08fa7ff173..688143587f 100644 --- a/modules/gui/qt/style/VLCIcons.qml +++ b/modules/gui/qt/style/VLCIcons.qml @@ -3,7 +3,7 @@ * This file was generated by makeIconFont.py, please do not edit by hand */ pragma Singleton -import QtQuick 2.12 +import QtQuick QtObject { readonly property FontLoader fontLoader : FontLoader { diff --git a/modules/gui/qt/style/VLCStyle.qml b/modules/gui/qt/style/VLCStyle.qml index b99390f42d..c7de3b3dd7 100644 --- a/modules/gui/qt/style/VLCStyle.qml +++ b/modules/gui/qt/style/VLCStyle.qml @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ pragma Singleton -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 QtObject { diff --git a/modules/gui/qt/tests/tst_FSM.qml b/modules/gui/qt/tests/tst_FSM.qml index 3cfbfda01b..febc6cc8bc 100644 --- a/modules/gui/qt/tests/tst_FSM.qml +++ b/modules/gui/qt/tests/tst_FSM.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtTest 1.12 +import QtQuick +import QtTest import "qrc:///util/" as Util TestCase { diff --git a/modules/gui/qt/util/qml/FSM.qml b/modules/gui/qt/util/qml/FSM.qml index a03af79c51..822e9ddbb8 100644 --- a/modules/gui/qt/util/qml/FSM.qml +++ b/modules/gui/qt/util/qml/FSM.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick /** * @brief a pure QML hierarchical Finite State Machine implementation diff --git a/modules/gui/qt/util/qml/FSMState.qml b/modules/gui/qt/util/qml/FSMState.qml index 8de9bb3a76..433a6a5b60 100644 --- a/modules/gui/qt/util/qml/FSMState.qml +++ b/modules/gui/qt/util/qml/FSMState.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick QtObject { property bool active: false diff --git a/modules/gui/qt/util/qml/FadeControllerStateGroup.qml b/modules/gui/qt/util/qml/FadeControllerStateGroup.qml index 055ab40168..36e422eba1 100644 --- a/modules/gui/qt/util/qml/FadeControllerStateGroup.qml +++ b/modules/gui/qt/util/qml/FadeControllerStateGroup.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///style/" diff --git a/modules/gui/qt/util/qml/FlickableScrollHandler.qml b/modules/gui/qt/util/qml/FlickableScrollHandler.qml index b3381a7c6c..cfb1f448a9 100644 --- a/modules/gui/qt/util/qml/FlickableScrollHandler.qml +++ b/modules/gui/qt/util/qml/FlickableScrollHandler.qml @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQml 2.12 +import QtQml import org.videolan.vlc 0.1 as VLC diff --git a/modules/gui/qt/util/qml/MLContextMenu.qml b/modules/gui/qt/util/qml/MLContextMenu.qml index 5409bc817b..4942cd63b9 100644 --- a/modules/gui/qt/util/qml/MLContextMenu.qml +++ b/modules/gui/qt/util/qml/MLContextMenu.qml @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQml 2.11 +import QtQml import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/util/qml/ModelSortSettingHandler.qml b/modules/gui/qt/util/qml/ModelSortSettingHandler.qml index e7f54b929c..f3472ae973 100644 --- a/modules/gui/qt/util/qml/ModelSortSettingHandler.qml +++ b/modules/gui/qt/util/qml/ModelSortSettingHandler.qml @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQml 2.12 +import QtQml import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/util/qml/NativeMenu.qml b/modules/gui/qt/util/qml/NativeMenu.qml index 2418f40dbc..d9ab4e33f4 100644 --- a/modules/gui/qt/util/qml/NativeMenu.qml +++ b/modules/gui/qt/util/qml/NativeMenu.qml @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQml 2.12 +import QtQml import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/util/qml/ViewDragAutoScrollHandler.qml b/modules/gui/qt/util/qml/ViewDragAutoScrollHandler.qml index 5d4a4ff7d2..5015296b74 100644 --- a/modules/gui/qt/util/qml/ViewDragAutoScrollHandler.qml +++ b/modules/gui/qt/util/qml/ViewDragAutoScrollHandler.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/AcrylicBackground.qml b/modules/gui/qt/widgets/qml/AcrylicBackground.qml index 3395609aa2..c824e7178f 100644 --- a/modules/gui/qt/widgets/qml/AcrylicBackground.qml +++ b/modules/gui/qt/widgets/qml/AcrylicBackground.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/ActionButtonOverlay.qml b/modules/gui/qt/widgets/qml/ActionButtonOverlay.qml index 6955783cde..b543b1bca7 100644 --- a/modules/gui/qt/widgets/qml/ActionButtonOverlay.qml +++ b/modules/gui/qt/widgets/qml/ActionButtonOverlay.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/ActionButtonPrimary.qml b/modules/gui/qt/widgets/qml/ActionButtonPrimary.qml index 1eb5d9083c..04543788aa 100644 --- a/modules/gui/qt/widgets/qml/ActionButtonPrimary.qml +++ b/modules/gui/qt/widgets/qml/ActionButtonPrimary.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/AnimatedBackground.qml b/modules/gui/qt/widgets/qml/AnimatedBackground.qml index 51d99f4b30..6896332377 100644 --- a/modules/gui/qt/widgets/qml/AnimatedBackground.qml +++ b/modules/gui/qt/widgets/qml/AnimatedBackground.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/BannerCone.qml b/modules/gui/qt/widgets/qml/BannerCone.qml index fd126f4b32..f7a795b8e2 100644 --- a/modules/gui/qt/widgets/qml/BannerCone.qml +++ b/modules/gui/qt/widgets/qml/BannerCone.qml @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/BannerTabButton.qml b/modules/gui/qt/widgets/qml/BannerTabButton.qml index 6687fa5a3f..27257a93e3 100644 --- a/modules/gui/qt/widgets/qml/BannerTabButton.qml +++ b/modules/gui/qt/widgets/qml/BannerTabButton.qml @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/BusyIndicatorExt.qml b/modules/gui/qt/widgets/qml/BusyIndicatorExt.qml index 1824f623cc..bd55c003af 100644 --- a/modules/gui/qt/widgets/qml/BusyIndicatorExt.qml +++ b/modules/gui/qt/widgets/qml/BusyIndicatorExt.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import "qrc:///style/" BusyIndicator { diff --git a/modules/gui/qt/widgets/qml/ButtonExt.qml b/modules/gui/qt/widgets/qml/ButtonExt.qml index 41ae62d97b..b2bb71b0d1 100644 --- a/modules/gui/qt/widgets/qml/ButtonExt.qml +++ b/modules/gui/qt/widgets/qml/ButtonExt.qml @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/CSDMouseStealer.qml b/modules/gui/qt/widgets/qml/CSDMouseStealer.qml index ec5a498416..8dc694e699 100644 --- a/modules/gui/qt/widgets/qml/CSDMouseStealer.qml +++ b/modules/gui/qt/widgets/qml/CSDMouseStealer.qml @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Window 2.15 +import QtQuick +import QtQuick.Window import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/CSDThemeButton.qml b/modules/gui/qt/widgets/qml/CSDThemeButton.qml index e4cd68f1d0..76b0d9351b 100644 --- a/modules/gui/qt/widgets/qml/CSDThemeButton.qml +++ b/modules/gui/qt/widgets/qml/CSDThemeButton.qml @@ -15,11 +15,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 -import QtQuick.Window 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Layouts +import QtQuick.Window import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/CSDThemeButtonSet.qml b/modules/gui/qt/widgets/qml/CSDThemeButtonSet.qml index 3b334ea1cd..bddafc4ce2 100644 --- a/modules/gui/qt/widgets/qml/CSDThemeButtonSet.qml +++ b/modules/gui/qt/widgets/qml/CSDThemeButtonSet.qml @@ -15,9 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Window +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/CSDTitlebarTapNDrapHandler.qml b/modules/gui/qt/widgets/qml/CSDTitlebarTapNDrapHandler.qml index 9e3cb09dfd..ca2b6af067 100644 --- a/modules/gui/qt/widgets/qml/CSDTitlebarTapNDrapHandler.qml +++ b/modules/gui/qt/widgets/qml/CSDTitlebarTapNDrapHandler.qml @@ -17,8 +17,8 @@ *****************************************************************************/ //CSD is only supported on Qt 5.15 -import QtQuick 2.15 -import QtQuick.Window 2.15 +import QtQuick +import QtQuick.Window import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/CSDWindowButton.qml b/modules/gui/qt/widgets/qml/CSDWindowButton.qml index 1abdb94124..a356ad2cdc 100644 --- a/modules/gui/qt/widgets/qml/CSDWindowButton.qml +++ b/modules/gui/qt/widgets/qml/CSDWindowButton.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/CSDWindowButtonSet.qml b/modules/gui/qt/widgets/qml/CSDWindowButtonSet.qml index eb866b4bc7..d3ec6aded1 100644 --- a/modules/gui/qt/widgets/qml/CSDWindowButtonSet.qml +++ b/modules/gui/qt/widgets/qml/CSDWindowButtonSet.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 +import QtQuick +import QtQuick.Window import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/CaptionLabel.qml b/modules/gui/qt/widgets/qml/CaptionLabel.qml index f2840847fa..cbfb0c4e10 100644 --- a/modules/gui/qt/widgets/qml/CaptionLabel.qml +++ b/modules/gui/qt/widgets/qml/CaptionLabel.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///style/" LabelExt { diff --git a/modules/gui/qt/widgets/qml/CheckButton.qml b/modules/gui/qt/widgets/qml/CheckButton.qml index 544bb76e42..01ac1dd384 100644 --- a/modules/gui/qt/widgets/qml/CheckButton.qml +++ b/modules/gui/qt/widgets/qml/CheckButton.qml @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/CheckedDelegate.qml b/modules/gui/qt/widgets/qml/CheckedDelegate.qml index b1dc607424..08282bb958 100644 --- a/modules/gui/qt/widgets/qml/CheckedDelegate.qml +++ b/modules/gui/qt/widgets/qml/CheckedDelegate.qml @@ -16,9 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T import org.videolan.vlc 0.1 import "." diff --git a/modules/gui/qt/widgets/qml/ComboBoxExt.qml b/modules/gui/qt/widgets/qml/ComboBoxExt.qml index 6e6b56fddd..aee88a35b8 100644 --- a/modules/gui/qt/widgets/qml/ComboBoxExt.qml +++ b/modules/gui/qt/widgets/qml/ComboBoxExt.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/CoverShadow.qml b/modules/gui/qt/widgets/qml/CoverShadow.qml index 55fdd011a1..dae6841717 100644 --- a/modules/gui/qt/widgets/qml/CoverShadow.qml +++ b/modules/gui/qt/widgets/qml/CoverShadow.qml @@ -16,8 +16,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtGraphicalEffects 1.12 +import QtQuick +import Qt5Compat.GraphicalEffects import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/CurrentIndicator.qml b/modules/gui/qt/widgets/qml/CurrentIndicator.qml index 019fea4023..a21aabccf7 100644 --- a/modules/gui/qt/widgets/qml/CurrentIndicator.qml +++ b/modules/gui/qt/widgets/qml/CurrentIndicator.qml @@ -16,8 +16,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import org.videolan.vlc 0.1 import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/DefaultShadow.qml b/modules/gui/qt/widgets/qml/DefaultShadow.qml index 564f893728..9c8c059efc 100644 --- a/modules/gui/qt/widgets/qml/DefaultShadow.qml +++ b/modules/gui/qt/widgets/qml/DefaultShadow.qml @@ -16,8 +16,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtGraphicalEffects 1.12 +import QtQuick +import Qt5Compat.GraphicalEffects import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/DoubleShadow.qml b/modules/gui/qt/widgets/qml/DoubleShadow.qml index 894f717560..c2240cb814 100644 --- a/modules/gui/qt/widgets/qml/DoubleShadow.qml +++ b/modules/gui/qt/widgets/qml/DoubleShadow.qml @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/DragItem.qml b/modules/gui/qt/widgets/qml/DragItem.qml index bd149f3312..68bdecef5e 100644 --- a/modules/gui/qt/widgets/qml/DragItem.qml +++ b/modules/gui/qt/widgets/qml/DragItem.qml @@ -17,12 +17,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +import QtQuick +import QtQuick.Templates as T +import QtQml.Models -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQml.Models 2.12 - -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.videolan.vlc 0.1 import org.videolan.controls 0.1 diff --git a/modules/gui/qt/widgets/qml/DrawerExt.qml b/modules/gui/qt/widgets/qml/DrawerExt.qml index 2857484845..ca845120e4 100644 --- a/modules/gui/qt/widgets/qml/DrawerExt.qml +++ b/modules/gui/qt/widgets/qml/DrawerExt.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/DropShadowImage.qml b/modules/gui/qt/widgets/qml/DropShadowImage.qml index a4b672764b..1e02e0a0f7 100644 --- a/modules/gui/qt/widgets/qml/DropShadowImage.qml +++ b/modules/gui/qt/widgets/qml/DropShadowImage.qml @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/EmptyLabel.qml b/modules/gui/qt/widgets/qml/EmptyLabel.qml index cbcc47b5df..2aaa286cee 100644 --- a/modules/gui/qt/widgets/qml/EmptyLabel.qml +++ b/modules/gui/qt/widgets/qml/EmptyLabel.qml @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import org.videolan.vlc 0.1 import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/EmptyLabelButton.qml b/modules/gui/qt/widgets/qml/EmptyLabelButton.qml index eab9c025e8..598c430556 100644 --- a/modules/gui/qt/widgets/qml/EmptyLabelButton.qml +++ b/modules/gui/qt/widgets/qml/EmptyLabelButton.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/EmptyLabelHint.qml b/modules/gui/qt/widgets/qml/EmptyLabelHint.qml index f0c8b377c3..7a323feb79 100644 --- a/modules/gui/qt/widgets/qml/EmptyLabelHint.qml +++ b/modules/gui/qt/widgets/qml/EmptyLabelHint.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/ExpandGridView.qml b/modules/gui/qt/widgets/qml/ExpandGridView.qml index fa2dfc0567..ca3a627b1d 100644 --- a/modules/gui/qt/widgets/qml/ExpandGridView.qml +++ b/modules/gui/qt/widgets/qml/ExpandGridView.qml @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Window +import QtQuick.Controls -import QtQml.Models 2.12 +import QtQml.Models import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/FadingEdge.qml b/modules/gui/qt/widgets/qml/FadingEdge.qml index 040855685c..72e6b2298e 100644 --- a/modules/gui/qt/widgets/qml/FadingEdge.qml +++ b/modules/gui/qt/widgets/qml/FadingEdge.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///style/" import "qrc:///util/Helpers.js" as Helpers diff --git a/modules/gui/qt/widgets/qml/FadingEdgeForListView.qml b/modules/gui/qt/widgets/qml/FadingEdgeForListView.qml index fb62e23215..483a701d11 100644 --- a/modules/gui/qt/widgets/qml/FadingEdgeForListView.qml +++ b/modules/gui/qt/widgets/qml/FadingEdgeForListView.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///style/" import "qrc:///util/Helpers.js" as Helpers diff --git a/modules/gui/qt/widgets/qml/FrostedGlassEffect.qml b/modules/gui/qt/widgets/qml/FrostedGlassEffect.qml index 777def6cd5..836a5bcde9 100644 --- a/modules/gui/qt/widgets/qml/FrostedGlassEffect.qml +++ b/modules/gui/qt/widgets/qml/FrostedGlassEffect.qml @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtGraphicalEffects 1.12 +import QtQuick +import Qt5Compat.GraphicalEffects import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/GridItem.qml b/modules/gui/qt/widgets/qml/GridItem.qml index 79c3036630..f56ade0a25 100644 --- a/modules/gui/qt/widgets/qml/GridItem.qml +++ b/modules/gui/qt/widgets/qml/GridItem.qml @@ -15,11 +15,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 -import QtQml.Models 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Layouts +import QtQml.Models import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/HorizontalResizeHandle.qml b/modules/gui/qt/widgets/qml/HorizontalResizeHandle.qml index 84ac1c4599..73426758bc 100644 --- a/modules/gui/qt/widgets/qml/HorizontalResizeHandle.qml +++ b/modules/gui/qt/widgets/qml/HorizontalResizeHandle.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import "qrc:///style/" import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/IconButton.qml b/modules/gui/qt/widgets/qml/IconButton.qml index b5517869c9..30a185b446 100644 --- a/modules/gui/qt/widgets/qml/IconButton.qml +++ b/modules/gui/qt/widgets/qml/IconButton.qml @@ -15,9 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/IconLabel.qml b/modules/gui/qt/widgets/qml/IconLabel.qml index 0f82682d80..dcbff0ca0b 100644 --- a/modules/gui/qt/widgets/qml/IconLabel.qml +++ b/modules/gui/qt/widgets/qml/IconLabel.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///style/" Text { diff --git a/modules/gui/qt/widgets/qml/IconToolButton.qml b/modules/gui/qt/widgets/qml/IconToolButton.qml index 98bdcf7045..dc4fa9f896 100644 --- a/modules/gui/qt/widgets/qml/IconToolButton.qml +++ b/modules/gui/qt/widgets/qml/IconToolButton.qml @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/IconTrackButton.qml b/modules/gui/qt/widgets/qml/IconTrackButton.qml index 9853ad030b..243776cd4f 100644 --- a/modules/gui/qt/widgets/qml/IconTrackButton.qml +++ b/modules/gui/qt/widgets/qml/IconTrackButton.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/ImageToolButton.qml b/modules/gui/qt/widgets/qml/ImageToolButton.qml index 2d64ca41a2..c8027aab1b 100644 --- a/modules/gui/qt/widgets/qml/ImageToolButton.qml +++ b/modules/gui/qt/widgets/qml/ImageToolButton.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/KeyNavigableListView.qml b/modules/gui/qt/widgets/qml/KeyNavigableListView.qml index 275855f47a..c22fb939dd 100644 --- a/modules/gui/qt/widgets/qml/KeyNavigableListView.qml +++ b/modules/gui/qt/widgets/qml/KeyNavigableListView.qml @@ -15,12 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Controls 2.12 - -import QtGraphicalEffects 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Window +import Qt5Compat.GraphicalEffects import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/KeyNavigableTableView.qml b/modules/gui/qt/widgets/qml/KeyNavigableTableView.qml index 040b34dc2a..99e576c54c 100644 --- a/modules/gui/qt/widgets/qml/KeyNavigableTableView.qml +++ b/modules/gui/qt/widgets/qml/KeyNavigableTableView.qml @@ -15,11 +15,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQml.Models 2.12 -import QtQuick.Layouts 1.12 -import QtGraphicalEffects 1.12 +import QtQuick +import QtQuick.Controls +import QtQml.Models +import QtQuick.Layouts +import Qt5Compat.GraphicalEffects + import org.videolan.vlc 0.1 import "qrc:///util/" as Util diff --git a/modules/gui/qt/widgets/qml/ListLabel.qml b/modules/gui/qt/widgets/qml/ListLabel.qml index 1a3656d431..aff7def291 100644 --- a/modules/gui/qt/widgets/qml/ListLabel.qml +++ b/modules/gui/qt/widgets/qml/ListLabel.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///style/" LabelExt { diff --git a/modules/gui/qt/widgets/qml/ListSubtitleLabel.qml b/modules/gui/qt/widgets/qml/ListSubtitleLabel.qml index a9243f5f4d..d8e203e488 100644 --- a/modules/gui/qt/widgets/qml/ListSubtitleLabel.qml +++ b/modules/gui/qt/widgets/qml/ListSubtitleLabel.qml @@ -15,6 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +import QtQuick ListLabel { opacity: 0.7 diff --git a/modules/gui/qt/widgets/qml/LocalTabBar.qml b/modules/gui/qt/widgets/qml/LocalTabBar.qml index 3de9377995..ee6e295cfd 100644 --- a/modules/gui/qt/widgets/qml/LocalTabBar.qml +++ b/modules/gui/qt/widgets/qml/LocalTabBar.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/MLDragItem.qml b/modules/gui/qt/widgets/qml/MLDragItem.qml index 8d2e056638..5debe82006 100644 --- a/modules/gui/qt/widgets/qml/MLDragItem.qml +++ b/modules/gui/qt/widgets/qml/MLDragItem.qml @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/widgets/qml/MediaCover.qml b/modules/gui/qt/widgets/qml/MediaCover.qml index 5a70a26b8d..d33c8fe664 100644 --- a/modules/gui/qt/widgets/qml/MediaCover.qml +++ b/modules/gui/qt/widgets/qml/MediaCover.qml @@ -16,8 +16,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import org.videolan.vlc 0.1 import org.videolan.controls 0.1 diff --git a/modules/gui/qt/widgets/qml/MenuCaption.qml b/modules/gui/qt/widgets/qml/MenuCaption.qml index 9926792f71..b68c068511 100644 --- a/modules/gui/qt/widgets/qml/MenuCaption.qml +++ b/modules/gui/qt/widgets/qml/MenuCaption.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import "qrc:///style/" T.Label { diff --git a/modules/gui/qt/widgets/qml/MenuLabel.qml b/modules/gui/qt/widgets/qml/MenuLabel.qml index fd090db52c..47594b6456 100644 --- a/modules/gui/qt/widgets/qml/MenuLabel.qml +++ b/modules/gui/qt/widgets/qml/MenuLabel.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///style/" LabelExt { diff --git a/modules/gui/qt/widgets/qml/NavigableCol.qml b/modules/gui/qt/widgets/qml/NavigableCol.qml index 192d10e78f..1da214ef3b 100644 --- a/modules/gui/qt/widgets/qml/NavigableCol.qml +++ b/modules/gui/qt/widgets/qml/NavigableCol.qml @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/NavigableRow.qml b/modules/gui/qt/widgets/qml/NavigableRow.qml index b30c552fac..66b9a53af0 100644 --- a/modules/gui/qt/widgets/qml/NavigableRow.qml +++ b/modules/gui/qt/widgets/qml/NavigableRow.qml @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/OverlayMenu.qml b/modules/gui/qt/widgets/qml/OverlayMenu.qml index e839d6d696..84008ae7e8 100644 --- a/modules/gui/qt/widgets/qml/OverlayMenu.qml +++ b/modules/gui/qt/widgets/qml/OverlayMenu.qml @@ -15,10 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Layouts import org.videolan.vlc 0.1 import "." diff --git a/modules/gui/qt/widgets/qml/PageLoader.qml b/modules/gui/qt/widgets/qml/PageLoader.qml index 9924548d3c..09c37bcadb 100644 --- a/modules/gui/qt/widgets/qml/PageLoader.qml +++ b/modules/gui/qt/widgets/qml/PageLoader.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 import "qrc:///util/Helpers.js" as Helpers diff --git a/modules/gui/qt/widgets/qml/PartialEffect.qml b/modules/gui/qt/widgets/qml/PartialEffect.qml index 462d7186cb..38dd639ea3 100644 --- a/modules/gui/qt/widgets/qml/PartialEffect.qml +++ b/modules/gui/qt/widgets/qml/PartialEffect.qml @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick // This item can be used as a layer effect. // The purpose of this item is to apply an effect to a partial diff --git a/modules/gui/qt/widgets/qml/PlayCover.qml b/modules/gui/qt/widgets/qml/PlayCover.qml index e2bd553521..3811c0b6cc 100644 --- a/modules/gui/qt/widgets/qml/PlayCover.qml +++ b/modules/gui/qt/widgets/qml/PlayCover.qml @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import org.videolan.vlc 0.1 import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/PointingTooltip.qml b/modules/gui/qt/widgets/qml/PointingTooltip.qml index e4a12dda77..272600b12a 100644 --- a/modules/gui/qt/widgets/qml/PointingTooltip.qml +++ b/modules/gui/qt/widgets/qml/PointingTooltip.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/PopupIconToolButton.qml b/modules/gui/qt/widgets/qml/PopupIconToolButton.qml index 1b1881d5c2..e03607dd4e 100644 --- a/modules/gui/qt/widgets/qml/PopupIconToolButton.qml +++ b/modules/gui/qt/widgets/qml/PopupIconToolButton.qml @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/RoundButton.qml b/modules/gui/qt/widgets/qml/RoundButton.qml index a6624eac17..14021ce881 100644 --- a/modules/gui/qt/widgets/qml/RoundButton.qml +++ b/modules/gui/qt/widgets/qml/RoundButton.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import org.videolan.vlc 0.1 import "qrc:///widgets/" as Widgets diff --git a/modules/gui/qt/widgets/qml/ScaledImage.qml b/modules/gui/qt/widgets/qml/ScaledImage.qml index 687f8c4444..7754620c92 100644 --- a/modules/gui/qt/widgets/qml/ScaledImage.qml +++ b/modules/gui/qt/widgets/qml/ScaledImage.qml @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/ScanProgressBar.qml b/modules/gui/qt/widgets/qml/ScanProgressBar.qml index ed1d980368..9ddab18ea3 100644 --- a/modules/gui/qt/widgets/qml/ScanProgressBar.qml +++ b/modules/gui/qt/widgets/qml/ScanProgressBar.qml @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/widgets/qml/SearchBox.qml b/modules/gui/qt/widgets/qml/SearchBox.qml index 70957944bd..b5184dd8d0 100644 --- a/modules/gui/qt/widgets/qml/SearchBox.qml +++ b/modules/gui/qt/widgets/qml/SearchBox.qml @@ -15,9 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/SliderExt.qml b/modules/gui/qt/widgets/qml/SliderExt.qml index 3db3905566..e9e8bc8a5b 100644 --- a/modules/gui/qt/widgets/qml/SliderExt.qml +++ b/modules/gui/qt/widgets/qml/SliderExt.qml @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/SortControl.qml b/modules/gui/qt/widgets/qml/SortControl.qml index 701907066d..44bafa64c8 100644 --- a/modules/gui/qt/widgets/qml/SortControl.qml +++ b/modules/gui/qt/widgets/qml/SortControl.qml @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/SpinBoxExt.qml b/modules/gui/qt/widgets/qml/SpinBoxExt.qml index e39f6ce23b..224e8d04a6 100644 --- a/modules/gui/qt/widgets/qml/SpinBoxExt.qml +++ b/modules/gui/qt/widgets/qml/SpinBoxExt.qml @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/StackViewExt.qml b/modules/gui/qt/widgets/qml/StackViewExt.qml index 8f9e5e4e63..5606b4961f 100644 --- a/modules/gui/qt/widgets/qml/StackViewExt.qml +++ b/modules/gui/qt/widgets/qml/StackViewExt.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/SubtitleLabel.qml b/modules/gui/qt/widgets/qml/SubtitleLabel.qml index c8b3b5b7c8..77434674db 100644 --- a/modules/gui/qt/widgets/qml/SubtitleLabel.qml +++ b/modules/gui/qt/widgets/qml/SubtitleLabel.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import "qrc:///style/" LabelExt { diff --git a/modules/gui/qt/widgets/qml/TableColumns.qml b/modules/gui/qt/widgets/qml/TableColumns.qml index c66d2d0299..fde447f923 100644 --- a/modules/gui/qt/widgets/qml/TableColumns.qml +++ b/modules/gui/qt/widgets/qml/TableColumns.qml @@ -15,9 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import org.videolan.vlc 0.1 import org.videolan.medialib 0.1 diff --git a/modules/gui/qt/widgets/qml/TableViewDelegate.qml b/modules/gui/qt/widgets/qml/TableViewDelegate.qml index b3e740d3a0..7c2bcff07a 100644 --- a/modules/gui/qt/widgets/qml/TableViewDelegate.qml +++ b/modules/gui/qt/widgets/qml/TableViewDelegate.qml @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/TextAutoScroller.qml b/modules/gui/qt/widgets/qml/TextAutoScroller.qml index a41e558ec1..4415b091b9 100644 --- a/modules/gui/qt/widgets/qml/TextAutoScroller.qml +++ b/modules/gui/qt/widgets/qml/TextAutoScroller.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/TextFieldExt.qml b/modules/gui/qt/widgets/qml/TextFieldExt.qml index 2a19128087..7e4f5b216c 100644 --- a/modules/gui/qt/widgets/qml/TextFieldExt.qml +++ b/modules/gui/qt/widgets/qml/TextFieldExt.qml @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick +import QtQuick.Controls import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/TextToolButton.qml b/modules/gui/qt/widgets/qml/TextToolButton.qml index 20a1018999..3695fedcf8 100644 --- a/modules/gui/qt/widgets/qml/TextToolButton.qml +++ b/modules/gui/qt/widgets/qml/TextToolButton.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/ToolTipExt.qml b/modules/gui/qt/widgets/qml/ToolTipExt.qml index 0127544f2f..96718bc2d6 100644 --- a/modules/gui/qt/widgets/qml/ToolTipExt.qml +++ b/modules/gui/qt/widgets/qml/ToolTipExt.qml @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import org.videolan.vlc 0.1 import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/TrackDelayButton.qml b/modules/gui/qt/widgets/qml/TrackDelayButton.qml index 1e97457b7f..0be0e065a0 100644 --- a/modules/gui/qt/widgets/qml/TrackDelayButton.qml +++ b/modules/gui/qt/widgets/qml/TrackDelayButton.qml @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Layouts import org.videolan.vlc 0.1 diff --git a/modules/gui/qt/widgets/qml/VideoProgressBar.qml b/modules/gui/qt/widgets/qml/VideoProgressBar.qml index 210b83234a..6c759aad4a 100644 --- a/modules/gui/qt/widgets/qml/VideoProgressBar.qml +++ b/modules/gui/qt/widgets/qml/VideoProgressBar.qml @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 +import QtQuick import org.videolan.vlc 0.1 import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/VideoQualityLabels.qml b/modules/gui/qt/widgets/qml/VideoQualityLabels.qml index 16e8dd0ab9..4ada54ff90 100644 --- a/modules/gui/qt/widgets/qml/VideoQualityLabels.qml +++ b/modules/gui/qt/widgets/qml/VideoQualityLabels.qml @@ -15,8 +15,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Templates as T import org.videolan.vlc 0.1 import "qrc:///style/" diff --git a/modules/gui/qt/widgets/qml/ViewHeader.qml b/modules/gui/qt/widgets/qml/ViewHeader.qml index 565fe7652c..6a371f5de0 100644 --- a/modules/gui/qt/widgets/qml/ViewHeader.qml +++ b/modules/gui/qt/widgets/qml/ViewHeader.qml @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Layouts +import QtQuick.Templates as T import org.videolan.vlc 0.1