Please see the ChangeLog

4 files changed, 2 insertions, 35 deletions

diff --git a/muse2/muse/CMakeLists.txt b/muse2/muse/CMakeLists.txt
index fe35ca65..3a8c5564 100644
--- a/muse2/muse/CMakeLists.txt
+++ b/muse2/muse/CMakeLists.txt
@@ -204,7 +204,7 @@ set_target_properties( core
       OUTPUT_NAME muse_core
       )
 set_target_properties( muse
-      PROPERTIES OUTPUT_NAME muse2
+      PROPERTIES OUTPUT_NAME ${MusE_EXEC_NAME}
       )
 set_target_properties( icons
       PROPERTIES OUTPUT_NAME muse_icons
diff --git a/muse2/muse/main.cpp b/muse2/muse/main.cpp
index ff4931bd..fccf801d 100644
--- a/muse2/muse/main.cpp
+++ b/muse2/muse/main.cpp
@@ -210,10 +210,6 @@ static void usage(const char* prog, const char* txt)
       fprintf(stderr, "   -L       don't use LASH\n");
 #endif
       fprintf(stderr, "   -l  xx   force locale to the given language/country code (xx = %s)\n", localeList().toLatin1().constData());
-      fprintf(stderr, "useful environment variables:\n");
-      fprintf(stderr, "   MUSE             override library and shared directories location\n");
-      fprintf(stderr, "   MUSEHOME         override user home directory (HOME/)\n");
-      fprintf(stderr, "   MUSEINSTRUMENTS  override user instrument directory (MUSEHOME/muse_instruments)\n");
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/midiedit/CMakeLists.txt b/muse2/muse/midiedit/CMakeLists.txt
index 3d0efe82..94bed2b2 100644
--- a/muse2/muse/midiedit/CMakeLists.txt
+++ b/muse2/muse/midiedit/CMakeLists.txt
@@ -91,6 +91,7 @@ set_target_properties( midiedit
 target_link_libraries ( midiedit
       ${QT_LIBRARIES}
       al
+      ctrl
       icons
       widgets
       ctrl
diff --git a/muse2/muse/widgets/filedialog.cpp b/muse2/muse/widgets/filedialog.cpp
index 02d4efb9..28c65ba5 100644
--- a/muse2/muse/widgets/filedialog.cpp
+++ b/muse2/muse/widgets/filedialog.cpp
@@ -247,36 +247,6 @@ void MFileDialog::directoryChanged(const QString&)
             }
       }
 
-/* ORCAN - disable preview for now. It is not available in qt4. We will
-           need to implement it ourselves.
-//---------------------------------------------------------
-//   ContentsPreview
-//---------------------------------------------------------
-
-ContentsPreview::~ContentsPreview()
-      {
-      if (bg)
-            delete bg;
-      }
-
-//---------------------------------------------------------
-//   ContentsPreview::showPreview
-//---------------------------------------------------------
-
-void ContentsPreview::previewUrl(const Q3Url& url)
-      {
-      if (!url.isLocalFile())
-            return;
-      if (url.path() == path)
-            return;
-      path = url.path();
-      if (bg)
-            delete bg;
-      bg  = new QPixmap(path);
-      if (bg)
-            setBackgroundPixmap(*bg);
-      }
-*/
 
 //---------------------------------------------------------
 //   getFilterExtension