LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

another try to fix plugins + build system

Browse source
This commit is contained in:
ws 2014-04-25 19:26:22 +02:00
parent eae279885d
commit 45d1979dcf
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libmscore/mscore.cpp
View file

@ -43,7 +43,7 @@
#include "stafftext.h" #include "stafftext.h"
#include "mscoreview.h" #include "mscoreview.h"
#include "plugins.h" #include "plugins.h"
#include "mscore/qmlplugin.h" // #include "mscore/qmlplugin.h"
namespace Ms { namespace Ms {
@ -297,7 +297,7 @@ QQmlEngine* MScore::qml()
//-----------mscore bindings //-----------mscore bindings
qmlRegisterType<MScore> ("MuseScore", 1, 0, "MScore"); qmlRegisterType<MScore> ("MuseScore", 1, 0, "MScore");
qmlRegisterType<MsScoreView>("MuseScore", 1, 0, "ScoreView"); qmlRegisterType<MsScoreView>("MuseScore", 1, 0, "ScoreView");
qmlRegisterType<QmlPlugin> ("MuseScore", 1, 0, "MuseScore"); // qmlRegisterType<QmlPlugin> ("MuseScore", 1, 0, "MuseScore");
qmlRegisterType<Score> ("MuseScore", 1, 0, "Score"); qmlRegisterType<Score> ("MuseScore", 1, 0, "Score");
qmlRegisterType<Segment> ("MuseScore", 1, 0, "Segment"); qmlRegisterType<Segment> ("MuseScore", 1, 0, "Segment");
qmlRegisterType<Chord> ("MuseScore", 1, 0, "Chord"); qmlRegisterType<Chord> ("MuseScore", 1, 0, "Chord");
@ -329,7 +329,6 @@ QQmlEngine* MScore::qml()
qmlRegisterType<ChordRest>(); qmlRegisterType<ChordRest>();
qmlRegisterType<SlurTie>(); qmlRegisterType<SlurTie>();
qmlRegisterType<Spanner>(); qmlRegisterType<Spanner>();
} }
return _qml; return _qml;
} }

6
mscore/musescore.cpp
View file

@ -94,6 +94,7 @@
#include "synthesizer/synthesizergui.h" #include "synthesizer/synthesizergui.h"
#include "synthesizer/msynthesizer.h" #include "synthesizer/msynthesizer.h"
#include "fluid/fluid.h" #include "fluid/fluid.h"
#include "qmlplugin.h"
#ifdef AEOLUS #ifdef AEOLUS
extern Ms::Synthesizer* createAeolus(); extern Ms::Synthesizer* createAeolus();
@ -4737,8 +4738,11 @@ int main(int argc, char* av[])
MScore::PDPI = screen->physicalDotsPerInch(); // physical resolution MScore::PDPI = screen->physicalDotsPerInch(); // physical resolution
//MScore::DPI = MScore::PDPI; // logical drawing resolution //MScore::DPI = MScore::PDPI; // logical drawing resolution
MScore::DPI = screen->logicalDotsPerInch(); // logical drawing resolution MScore::DPI = screen->logicalDotsPerInch(); // logical drawing resolution
MScore::init(); // initialize libmscore MScore::init(); // initialize libmscore
#ifdef SCRIPT_INTERFACE
qmlRegisterType<QmlPlugin> ("MuseScore", 1, 0, "MuseScore");
#endif
if (MScore::debugMode) { if (MScore::debugMode) {
qDebug("DPI %f", MScore::DPI); qDebug("DPI %f", MScore::DPI);