diff --git a/CMakeLists.txt b/CMakeLists.txt index 6adc0693a1f72..22d33ddb3acd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,6 +104,7 @@ option(MUE_DOWNLOAD_SOUNDFONT "Download the latest soundfont version as part of # === Pack === option(MUE_RUN_LRELEASE "Generate .qm files" ON) option(MUE_INSTALL_SOUNDFONT "Install sound font" ON) +option(MUE_RUN_WINDEPLOYQT "Run windeployqt" ON) # === Tests === set(MUE_VTEST_MSCORE_REF_BIN "${CMAKE_CURRENT_LIST_DIR}/../MU_ORIGIN/MuseScore/build.debug/install/${INSTALL_SUBDIR}/mscore" CACHE PATH "Path to mscore ref bin") diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 6b9b431765b09..fd2976b559362 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -353,16 +353,17 @@ if (OS_IS_WIN) configure_file(${PROJECT_SOURCE_DIR}/buildscripts/packaging/Windows/PortableApps/appinfo.ini.in ${CMAKE_INSTALL_PREFIX}/../../App/AppInfo/appinfo.ini @ONLY) endif (WIN_PORTABLE) - set(deploy_tool_options_arg "--plugindir bin --qmldir ${PROJECT_SOURCE_DIR}") - - qt_generate_deploy_qml_app_script( - TARGET MuseScoreStudio - OUTPUT_SCRIPT deploy_script - NO_UNSUPPORTED_PLATFORM_ERROR - DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg} - ) + if (MUE_RUN_WINDEPLOYQT) + set(deploy_tool_options_arg "--plugindir bin --qmldir ${PROJECT_SOURCE_DIR}") + qt_generate_deploy_qml_app_script( + TARGET MuseScoreStudio + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR + DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg} + ) - install(SCRIPT ${deploy_script}) + install(SCRIPT ${deploy_script}) + endif() # MUE_RUN_WINDEPLOYQT ########################################### # Linux diff --git a/src/app/internal/guiapp.cpp b/src/app/internal/guiapp.cpp index 5fd2b52cae475..1c808559b49dd 100644 --- a/src/app/internal/guiapp.cpp +++ b/src/app/internal/guiapp.cpp @@ -246,7 +246,12 @@ void GuiApp::perform() // The main window must be shown at this point so KDDockWidgets can read its size correctly // and scale all sizes properly. https://github.com/musescore/MuseScore/issues/21148 + // but before that, let's make the window transparent, + // otherwise the empty window frame will be visible + // https://github.com/musescore/MuseScore/issues/29630 + // Transparency will be removed after the page loads. QQuickWindow* w = dynamic_cast(obj); + w->setOpacity(0.01); w->setVisible(true); startupScenario()->runAfterSplashScreen(); diff --git a/src/appshell/qml/WindowContent.qml b/src/appshell/qml/WindowContent.qml index a46ccce30fb53..49b7e9d5c5c19 100644 --- a/src/appshell/qml/WindowContent.qml +++ b/src/appshell/qml/WindowContent.qml @@ -39,6 +39,7 @@ DockWindow { onPageLoaded: { interactiveProvider.onPageOpened() + window.opacity = 1.0 } InteractiveProvider {