Revert "prepare release of 2.0 beta2"

This reverts commit a925ae0.
musescore · Dec 22, 2014 · 88e0c0f · 88e0c0f
1 parent a925ae0
commit 88e0c0f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -22,8 +22,8 @@ REVISION  = `cat mscore/revision.h`
 CPUS      = `grep -c processor /proc/cpuinfo`
 
 PREFIX    = "/usr/local"
-#VERSION   = "2.0b-${REVISION}"
-VERSION   = 2.0beta2
+VERSION   = "2.0b-${REVISION}"
+#VERSION   = 2.0
 
 #
 # change path to include your Qt5 installation

diff --git a/Makefile.mingw b/Makefile.mingw
@@ -20,9 +20,7 @@
 
 
 REVISION  = $(shell type mscore\revision.h)
-#VERSION   = 2.0b-${REVISION}
-VERSION = 2.0beta2
-
+VERSION   = 2.0b-${REVISION}
 CPUS = 1
 
 release:

diff --git a/Makefile.osx b/Makefile.osx
@@ -19,8 +19,7 @@
 #=============================================================================
 
 REVISION  = `cat mscore/revision.h`
-#VERSION   = "2.0b-${REVISION}"
-VERSION = 2.0beta2
+VERSION   = "2.0b-${REVISION}"
 
 PREFIX=../applebuild
 

diff --git a/build/packaging/WIX.template.in b/build/packaging/WIX.template.in
@@ -17,7 +17,7 @@
     <Product Id="$(var.CPACK_WIX_PRODUCT_GUID)"
         Name="$(var.ProdName)"
         Language="1033"
-        Version="1.96.0"
+        Version="$(var.CPACK_PACKAGE_VERSION)"
         Manufacturer="$(var.CPACK_PACKAGE_VENDOR)"
         UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)">
 

diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -4451,14 +4451,14 @@ int main(int argc, char* av[])
       f.close();
 
 #ifdef Q_OS_MAC
-      MuseScoreApplication* app = new MuseScoreApplication("mscore2", argc, av);
+      MuseScoreApplication* app = new MuseScoreApplication("mscore-dev", argc, av);
 #else
-      QtSingleApplication* app = new QtSingleApplication("mscore2", argc, av);
+      QtSingleApplication* app = new QtSingleApplication("mscore-dev", argc, av);
 #endif
 
       QCoreApplication::setOrganizationName("MuseScore");
       QCoreApplication::setOrganizationDomain("musescore.org");
-      QCoreApplication::setApplicationName("MuseScore2");
+      QCoreApplication::setApplicationName("MuseScoreDevelopment");
       QAccessible::installFactory(AccessibleScoreView::ScoreViewFactory);
       Q_INIT_RESOURCE(zita);
       Q_INIT_RESOURCE(noeffect);

diff --git a/mscore/musescore.h b/mscore/musescore.h
@@ -388,10 +388,10 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
       void startDebugger();
       void midiinToggled(bool);
       void undoRedo(bool undo);
-      void showPlayPanel(bool);
       void showPalette(bool);
       void showInspector(bool);
       void showOmrPanel(bool);
+      void showPlayPanel(bool);
       void showNavigator(bool);
       void showMixer(bool);
       void showSynthControl(bool);

diff --git a/mscore/updatechecker.cpp b/mscore/updatechecker.cpp
@@ -112,7 +112,7 @@ void UpdateChecker::check(QString rev, bool m)
     #if defined(Q_OS_MAC)
     os = "mac";
     #endif
-    if(qApp->applicationName() == "MuseScore2"){ //avoid nightly cymbals
+    if(qApp->applicationName() == "MuseScore"){ //avoid nightly cymbals
           if(MuseScore::unstable()){
                   release = "pre";
           }else{
@@ -135,7 +135,7 @@ void UpdateChecker::check(QString rev, bool m)
 int UpdateChecker::defaultPeriod()
       {
         int result = 24;
-        if(qApp->applicationName() == "MuseScore2"){ //avoid nightly cymbals
+        if(qApp->applicationName() == "MuseScore"){ //avoid nightly cymbals
             if(MuseScore::unstable()){
                   result = 24;
             }else{