From f82d146d6f3917220d49cf61a0a23a491ae57c5a Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Tue, 28 Dec 2010 02:25:42 +0000 Subject: commented out a line that broke compilation --- muse2/ChangeLog | 2 ++ muse2/muse/widgets/projectcreateimpl.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/muse2/ChangeLog b/muse2/ChangeLog index a9362449..f407f58f 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,6 +1,8 @@ 28.12.2010: - Tweaked and added some delays during project load to counter threading issues during loading of projects (rj) + - Commented out the comment placeholder text line in projectcreateimpl.cpp. It + broke the compilation against Qt-4.7. (Orcan) 27.12.2010: - Added a first try at project creation dialog, we'll see how much territory it covers, intentionally it's only used upon creation of a project, later 'Save As' diff --git a/muse2/muse/widgets/projectcreateimpl.cpp b/muse2/muse/widgets/projectcreateimpl.cpp index 5e81cfe4..a019df95 100644 --- a/muse2/muse/widgets/projectcreateimpl.cpp +++ b/muse2/muse/widgets/projectcreateimpl.cpp @@ -18,7 +18,9 @@ ProjectCreateImpl::ProjectCreateImpl(QWidget *parent) : connect(buttonBox, SIGNAL(accepted()), this, SLOT(ok())); #if QT_VERSION >= 0x040700 projectNameEdit->setPlaceholderText(""); - commentEdit->setPlaceholderText(""); + // Orcan: Commented out since there is no QPlainTextEdit::setPlaceholderText() + // as of Qt-4.7.1 + //commentEdit->setPlaceholderText(""); #endif directoryPath = config.projectBaseFolder; updateDirectoryPath(); -- cgit v1.2.3