On Thu, Apr 22, 2010 at 5:01 PM, D. Michael McIntyre wrote:
> On Thursday 22 April 2010, Chris Cannam wrote:
>
>> This is a routine maintenance release with a number of bug fixes....
>
> OK, I folded that into the stub release note I had ready, and I rolled a
> tarball. I'm test building the tarball now.
>
> Under the circumstances, and considering how little has changed, I'm just
> going to release the tarball once I've confirmed that it builds here, and make
> a very cursory effort at avoiding obvious showstoppers. I just don't have the
> energy for even a token attempt at a -rc tarball.
Eh, I wasn't fast enough to make a build to report.
Apparently, changes in qt-4.7 make rosegarden fail to compile. I
noticed 2 issues:
1- qt-4.7 implemented the overloaded function
uint qHash ( const QUrl & url )
which brings us a clash with the implementation in
src/base/UrlHash.cpp
See qt-4.7 page:
http://doc.qt.nokia.com/4.7-snapshot/qt4-7-intro.html#%20%20%20new-global-functions
Here is the failed build log:
http://koji.fedoraproject.org/koji/getfile?taskID=2133161&name=build.log
2- I think with qt-4.7, QString() does not accept int's. Here is the
failed build log (after fixing up the issue 1):
http://koji.fedoraproject.org/koji/getfile?taskID=2133184&name=build.log
Attached patch resolves both issues. I wish I was a bit faster.
Anyway, please consider adding these to the trunk, so the next release
can compile against qt-4.7, which will probably released in a couple
months.
Cheers,
Orcan
diff -rupN rosegarden-10.04.old/src/base/UrlHash.cpp rosegarden-10.04/src/base/UrlHash.cpp
--- rosegarden-10.04.old/src/base/UrlHash.cpp 2010-04-22 16:43:56.000000000 -0400
+++ rosegarden-10.04/src/base/UrlHash.cpp 2010-04-22 23:02:09.000000000 -0400
@@ -16,10 +16,10 @@
#include <QUrl>
#include <QHash> // to ensure correct qHash(const QString &) is found
-
+#if QT_VERSION < 0x040700
unsigned int
qHash(const QUrl &u)
{
return qHash(u.toString());
}
-
+#endif
diff -rupN rosegarden-10.04.old/src/gui/dialogs/KeySignatureDialog.h rosegarden-10.04/src/gui/dialogs/KeySignatureDialog.h
--- rosegarden-10.04.old/src/gui/dialogs/KeySignatureDialog.h 2010-04-22 16:43:42.000000000 -0400
+++ rosegarden-10.04/src/gui/dialogs/KeySignatureDialog.h 2010-04-22 23:24:30.000000000 -0400
@@ -57,7 +57,7 @@ public:
Rosegarden::Key::DefaultKey,
bool showApplyToAll = true,
bool showConversionOptions = true,
- QString explanatoryText = 0);
+ QString explanatoryText = "");
bool isValid() const;
::Rosegarden::Key getKey() const;
diff -rupN rosegarden-10.04.old/src/gui/dialogs/TimeSignatureDialog.h rosegarden-10.04/src/gui/dialogs/TimeSignatureDialog.h
--- rosegarden-10.04.old/src/gui/dialogs/TimeSignatureDialog.h 2010-04-22 16:43:42.000000000 -0400
+++ rosegarden-10.04/src/gui/dialogs/TimeSignatureDialog.h 2010-04-22 23:14:09.000000000 -0400
@@ -49,7 +49,7 @@ public:
TimeSignature defaultSig =
TimeSignature::DefaultTimeSignature,
bool timeEditable = false,
- QString explanatoryText = 0);
+ QString explanatoryText = "");
TimeSignature getTimeSignature() const;
------------------------------------------------------------------------------
_______________________________________________
Rosegarden-devel mailing list
[email protected] - use the link below to unsubscribe
https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
