diff options
| author | adam <adam@pkgsrc.org> | 2011-03-03 05:50:03 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2011-03-03 05:50:03 +0000 |
| commit | 8ba4414cb82fd68577ce4eccabaa9609d79cfcd3 (patch) | |
| tree | 387f15f8d5b42a6bbad64cfa0ffcff282752c037 /x11/qt4-libs/patches/patch-ce | |
| parent | 6c1eb839470fde509d842f2059f076aa2360ef29 (diff) | |
| download | pkgsrc-8ba4414cb82fd68577ce4eccabaa9609d79cfcd3.tar.gz | |
Changes 4.7.2:
This is a maintenance release which contains bug-fixes based on feedback and
contributions since the Qt 4.7.1 release back in November. It also marks the
official release of Qt Quick.
Qt Quick is a new feature within Qt that makes it easy to create light-weight
apps and UIs. It contains the new QML language, the Qt Declarative module, and
new tooling in Qt Creator to easily build apps.
PkgSrc: now builds with Clang.
Diffstat (limited to 'x11/qt4-libs/patches/patch-ce')
| -rw-r--r-- | x11/qt4-libs/patches/patch-ce | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/x11/qt4-libs/patches/patch-ce b/x11/qt4-libs/patches/patch-ce new file mode 100644 index 00000000000..d5547a1a4f5 --- /dev/null +++ b/x11/qt4-libs/patches/patch-ce @@ -0,0 +1,24 @@ +$NetBSD: patch-ce,v 1.1 2011/03/03 05:50:04 adam Exp $ + +Avoid error when compiling with Clang. + +--- src/gui/kernel/qcocoamenuloader_mac.mm.orig 2011-01-12 10:11:02.000000000 +0000 ++++ src/gui/kernel/qcocoamenuloader_mac.mm +@@ -70,13 +70,13 @@ QT_USE_NAMESPACE + showAllItem = [[appMenu itemWithTitle:@"Show All"] retain]; + + // Get the names in the nib to match the app name set by Qt. +- NSString *appName = reinterpret_cast<const NSString*>(QCFString::toCFStringRef(qAppName())); ++ const NSString *appName = reinterpret_cast<const NSString*>(QCFString::toCFStringRef(qAppName())); + [quitItem setTitle:[[quitItem title] stringByReplacingOccurrencesOfString:@"NewApplication" +- withString:appName]]; ++ withString:(NSString *)appName]]; + [hideItem setTitle:[[hideItem title] stringByReplacingOccurrencesOfString:@"NewApplication" +- withString:appName]]; ++ withString:(NSString *)appName]]; + [aboutItem setTitle:[[aboutItem title] stringByReplacingOccurrencesOfString:@"NewApplication" +- withString:appName]]; ++ withString:(NSString *)appName]]; + [appName release]; + // Disable the items that don't do anything. If someone associates a QAction with them + // They should get synced back in. |