[vlc-commits] qt: move qt styles classes

Pierre Lamot git at videolan.org
Tue Dec 17 15:37:51 CET 2019


vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Dec  6 17:42:27 2019 +0100| [777f70c47688097d9c6d534dda809a682d941f46] | committer: Jean-Baptiste Kempf

qt: move qt styles classes

  no functionnal changes

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=777f70c47688097d9c6d534dda809a682d941f46
---

 modules/gui/qt/Makefile.am                   | 8 ++++----
 modules/gui/qt/{qml => }/style/VLCColors.qml | 0
 modules/gui/qt/{qml => }/style/VLCIcons.qml  | 0
 modules/gui/qt/{qml => }/style/VLCStyle.qml  | 0
 modules/gui/qt/{qml => }/style/qmldir        | 0
 modules/gui/qt/vlc.qrc                       | 8 ++++----
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index bdd4272ed6..bb6f09331f 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -632,10 +632,10 @@ libqt_plugin_la_QML = \
 	gui/qt/playlist/qml/PLItem.qml \
 	gui/qt/playlist/qml/PLItemFooter.qml \
 	gui/qt/playlist/qml/PlaylistMenu.qml \
-	gui/qt/qml/style/qmldir \
-	gui/qt/qml/style/VLCIcons.qml \
-	gui/qt/qml/style/VLCStyle.qml \
-	gui/qt/qml/style/VLCColors.qml
+	gui/qt/style/qmldir \
+	gui/qt/style/VLCIcons.qml \
+	gui/qt/style/VLCStyle.qml \
+	gui/qt/style/VLCColors.qml
 
 EXTRA_DIST += gui/qt/vlc.qrc $(libqt_plugin_la_RES)
 
diff --git a/modules/gui/qt/qml/style/VLCColors.qml b/modules/gui/qt/style/VLCColors.qml
similarity index 100%
rename from modules/gui/qt/qml/style/VLCColors.qml
rename to modules/gui/qt/style/VLCColors.qml
diff --git a/modules/gui/qt/qml/style/VLCIcons.qml b/modules/gui/qt/style/VLCIcons.qml
similarity index 100%
rename from modules/gui/qt/qml/style/VLCIcons.qml
rename to modules/gui/qt/style/VLCIcons.qml
diff --git a/modules/gui/qt/qml/style/VLCStyle.qml b/modules/gui/qt/style/VLCStyle.qml
similarity index 100%
rename from modules/gui/qt/qml/style/VLCStyle.qml
rename to modules/gui/qt/style/VLCStyle.qml
diff --git a/modules/gui/qt/qml/style/qmldir b/modules/gui/qt/style/qmldir
similarity index 100%
rename from modules/gui/qt/qml/style/qmldir
rename to modules/gui/qt/style/qmldir
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index ad1e705fc7..5ac5dea23f 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -235,10 +235,10 @@
         <file alias="AudioGridItem.qml">medialibrary/qml/AudioGridItem.qml</file>
     </qresource>
     <qresource prefix="/style">
-        <file alias="qmldir">qml/style/qmldir</file>
-        <file alias="VLCStyle.qml">qml/style/VLCStyle.qml</file>
-        <file alias="VLCColors.qml">qml/style/VLCColors.qml</file>
-        <file alias="VLCIcons.qml">qml/style/VLCIcons.qml</file>
+        <file alias="qmldir">style/qmldir</file>
+        <file alias="VLCStyle.qml">style/VLCStyle.qml</file>
+        <file alias="VLCColors.qml">style/VLCColors.qml</file>
+        <file alias="VLCIcons.qml">style/VLCIcons.qml</file>
     </qresource>
     <qresource prefix="/playlist">
         <file alias="PLItem.qml">playlist/qml/PLItem.qml</file>



More information about the vlc-commits mailing list