Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix QML palettes on Windows #5292

Merged
merged 2 commits into from
Aug 31, 2019

Conversation

dmitrio95
Copy link
Contributor

@dmitrio95 dmitrio95 commented Aug 31, 2019

A follow-up to #5289 which resulted in palettes being not displayed in Windows builds.

@@ -87,6 +87,7 @@

#include "palette/palettetree.h"
#include "palette/palettewidget.h"
#include "qml/msqmlengine.h"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs an #ifdef Q_OS_WIN or some such

@@ -297,6 +298,7 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
PluginManager* pluginManager { 0 };
QmlPluginEngine* _qmlEngine { 0 };
#endif
MsQmlEngine* _qmlUiEngine { 0 };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably this too

@anatoly-os anatoly-os merged commit 444b36f into musescore:master Aug 31, 2019
anatoly-os added a commit that referenced this pull request Aug 31, 2019
@dmitrio95 dmitrio95 deleted the qml-palettes-windows-fix branch September 17, 2019 16:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants