From d647b28733e8cd1713e47b286bbdbace83053cb4 Mon Sep 17 00:00:00 2001 From: kelteseth Date: Sun, 11 Nov 2018 17:56:35 +0100 Subject: [PATCH] Add ScreenPlayWindow deploy --- ScreenPlayWindow/SPWResources.qrc | 2 +- ScreenPlayWindow/{ => qml}/main.qml | 0 ScreenPlayWindow/src/SPWmainwindow.cpp | 2 +- scripts/package.bat | 3 +++ 4 files changed, 5 insertions(+), 2 deletions(-) rename ScreenPlayWindow/{ => qml}/main.qml (100%) diff --git a/ScreenPlayWindow/SPWResources.qrc b/ScreenPlayWindow/SPWResources.qrc index 5f6483ac..69145a82 100644 --- a/ScreenPlayWindow/SPWResources.qrc +++ b/ScreenPlayWindow/SPWResources.qrc @@ -1,5 +1,5 @@ - main.qml + qml/main.qml diff --git a/ScreenPlayWindow/main.qml b/ScreenPlayWindow/qml/main.qml similarity index 100% rename from ScreenPlayWindow/main.qml rename to ScreenPlayWindow/qml/main.qml diff --git a/ScreenPlayWindow/src/SPWmainwindow.cpp b/ScreenPlayWindow/src/SPWmainwindow.cpp index fc12fb62..9dee8250 100644 --- a/ScreenPlayWindow/src/SPWmainwindow.cpp +++ b/ScreenPlayWindow/src/SPWmainwindow.cpp @@ -121,7 +121,7 @@ MainWindow::MainWindow(int i, QString projectPath, QString id, QString decoder, m_quickRenderer = QSharedPointer(new QQuickView(this)); m_quickRenderer.data()->rootContext()->setContextProperty("mainwindow", this); - m_quickRenderer.data()->setSource(QUrl("qrc:/main.qml")); + m_quickRenderer.data()->setSource(QUrl("qrc:/qml/main.qml")); m_quickRenderer.data()->setGeometry(0, 0, width(), height()); m_quickRenderer.data()->setResizeMode(QQuickView::ResizeMode::SizeRootObjectToView); m_quickRenderer.data()->setFlags(flags | Qt::FramelessWindowHint | Qt::WindowStaysOnBottomHint); diff --git a/scripts/package.bat b/scripts/package.bat index 1d7ef32c..8be7de03 100644 --- a/scripts/package.bat +++ b/scripts/package.bat @@ -29,6 +29,7 @@ xcopy C:\Qt\Tools\QtCreator\bin\ssleay32.dll ..\PACKAGE cd .. windeployqt.exe --release --qmldir ScreenPlay/qml PACKAGE/ScreenPlay.exe +windeployqt.exe --release --qmldir ScreenPlayWindow/qml PACKAGE/ScreenPlayWindow.exe cd PACKAGE @@ -37,4 +38,6 @@ del /f *.moc del /f *.h del /f *.obj del /f *.res +del /f *.exp +del /f *.lib