summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Schweer <ws.seh.de>2006-10-05 08:13:52 +0000
committerWerner Schweer <ws.seh.de>2006-10-05 08:13:52 +0000
commit91da1c4495f7e08a1021ddc29557154bae5f3912 (patch)
treefed238b7b64b17e1a4732beb50732b4595c8992f
parentdd857add5c12eee6fc3e52e4e2da48b4539472c6 (diff)
require QT4.2.0 minimum version
-rw-r--r--muse/CMakeLists.txt3
-rw-r--r--muse/ChangeLog2
-rw-r--r--muse/muse/midiedit/citem.h1
3 files changed, 5 insertions, 1 deletions
diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt
index 12dbade5..531eae2b 100644
--- a/muse/CMakeLists.txt
+++ b/muse/CMakeLists.txt
@@ -50,6 +50,7 @@ option ( ENABLE_FLUID "enable fluidsynth softsynth plugins" ON)
# for debugging the make system uncomment next line:
# set(CMAKE_VERBOSE_MAKEFILE ON)
+set(QT_MIN_VERSION "4.2.0")
set(QT_USE_QTXML TRUE)
set(QT_USE_QTDESIGNER TRUE)
set(QT_USE_QTNSPLUGIN TRUE)
@@ -73,7 +74,7 @@ endif (APPLE)
find_package(Qt4)
if (NOT QT4_FOUND)
- message(FATAL_ERROR "Fatal error: QT (version >= 4.1.0) required.\n"
+ message(FATAL_ERROR "Fatal error: QT (version >= 4.2.0) required.\n"
"Cmake tries to detect QT4 by searching for 'qmake' in your PATH\n"
"If you have QT4 installed, make sure qmake is found in your PATH."
)
diff --git a/muse/ChangeLog b/muse/ChangeLog
index f68da4df..90f91eeb 100644
--- a/muse/ChangeLog
+++ b/muse/ChangeLog
@@ -1,3 +1,5 @@
+5.10 (ws)
+ - QT4.2 is now minimum required version
4.10 (rj)
- Select the right item when items are stacked on top of each other, for
pianoroll and arranger (rj)
diff --git a/muse/muse/midiedit/citem.h b/muse/muse/midiedit/citem.h
index 283d2422..5b3452ac 100644
--- a/muse/muse/midiedit/citem.h
+++ b/muse/muse/midiedit/citem.h
@@ -52,6 +52,7 @@ struct CItem {
};
typedef std::multimap<int, CItem*, std::less<int> >::iterator iCItem;
+typedef std::multimap<int, CItem*, std::less<int> >::const_iterator ciCItem;
typedef std::multimap<int, CItem*, std::less<int> >::const_reverse_iterator rciCItem;
//---------------------------------------------------------