Skip to content

Commit

Permalink
fix text color of Qt 5.15.1 Controls 2 combos on Fusion Dark
Browse files Browse the repository at this point in the history
  • Loading branch information
ddennedy committed Nov 25, 2020
1 parent 927e3d7 commit 353b8eb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions scripts/build-shotcut-msys2.sh
Expand Up @@ -986,6 +986,7 @@ function deploy
cmd cp -pr "$QTDIR"/qml lib
sed -i "s/onClicked()/onClicked(mouse)/" lib/qml/QtQuick/Controls/Private/EditMenu_base.qml
cmd rm lib/qml/QtQuick/Controls/Private/EditMenu_base.qmlc
cmd curl -o lib/qml/QtQuick/Controls.2/Fusion/ComboBox.qml "https://s3.amazonaws.com/misc.meltymedia/shotcut-build/ComboBox.qml"
cmd cp -pr "$QTDIR"/translations/qt_*.qm share/translations
cmd cp -pr "$QTDIR"/translations/qtbase_*.qm share/translations

Expand Down
2 changes: 2 additions & 0 deletions scripts/build-shotcut.sh
Expand Up @@ -1541,6 +1541,7 @@ function configure_compile_install_subproject {
cmd cp -a "$QTDIR"/plugins/{audio,egldeviceintegrations,generic,iconengines,imageformats,mediaservice,platforminputcontexts,platforms,platformthemes,wayland-decoration-client,wayland-graphics-integration-client,wayland-graphics-integration-server,wayland-shell-integration,xcbglintegrations} "$FINAL_INSTALL_DIR"/lib/qt5
cmd cp -p "$QTDIR"/plugins/sqldrivers/libqsqlite.so "$FINAL_INSTALL_DIR"/lib/qt5/sqldrivers
cmd cp -a "$QTDIR"/qml "$FINAL_INSTALL_DIR"/lib
cmd curl -o "$FINAL_INSTALL_DIR"/lib/qml/QtQuick/Controls.2/Fusion/ComboBox.qml "https://s3.amazonaws.com/misc.meltymedia/shotcut-build/ComboBox.qml"
cmd install -d "$FINAL_INSTALL_DIR"/lib/va
cmd install -p -c /usr/lib/x86_64-linux-gnu/dri/*_drv_video.so "$FINAL_INSTALL_DIR"/lib/va
fi
Expand Down Expand Up @@ -1862,6 +1863,7 @@ function deploy_osx
elif [ -d "/Applications/Qt Creator.app/Contents/Imports/qtquick2" ]; then
cmd cp -a "/Applications/Qt Creator.app/Contents/Imports/qtquick2" Resources/qml
fi
cmd curl -o Resources/qml/QtQuick/Controls.2/Fusion/ComboBox.qml "https://s3.amazonaws.com/misc.meltymedia/shotcut-build/ComboBox.qml"
for lib in $(find Resources -name '*.dylib'); do
fixlibs "$lib"
done
Expand Down

0 comments on commit 353b8eb

Please sign in to comment.