summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-12-13 14:04:17 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2010-12-13 14:04:17 +0000
commit4ef6b1bb03a3ae89e33530bc88e65a1e96ac4020 (patch)
treedd335ceb1777eaf6276e52433222c82a8bef1eae /app-cdr/k3b/files
parentVersion bump #348147 by Francisco Javier. (diff)
downloadhistorical-4ef6b1bb03a3ae89e33530bc88e65a1e96ac4020.tar.gz
historical-4ef6b1bb03a3ae89e33530bc88e65a1e96ac4020.tar.bz2
historical-4ef6b1bb03a3ae89e33530bc88e65a1e96ac4020.zip
Revision bump to fix crashing when using qt-4.7
Package-Manager: portage-2.2.0_alpha8/cvs/Linux x86_64
Diffstat (limited to 'app-cdr/k3b/files')
-rw-r--r--app-cdr/k3b/files/2.0.1-fix-crash-with-qt-4.7.0.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/app-cdr/k3b/files/2.0.1-fix-crash-with-qt-4.7.0.patch b/app-cdr/k3b/files/2.0.1-fix-crash-with-qt-4.7.0.patch
new file mode 100644
index 000000000000..a99b5c639cae
--- /dev/null
+++ b/app-cdr/k3b/files/2.0.1-fix-crash-with-qt-4.7.0.patch
@@ -0,0 +1,37 @@
+Index: src/option/k3bpluginoptiontab.cpp
+===================================================================
+--- src/option/k3bpluginoptiontab.cpp (revision 1168967)
++++ src/option/k3bpluginoptiontab.cpp (working copy)
+@@ -43,12 +43,28 @@
+ layout->addWidget( label );
+ layout->addWidget( pluginSelector );
+
++ // find all categories
++ QHash<QString, QString> categoryNames;
++
+ foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) {
+- kDebug() << "Adding plugin" << plugin->pluginInfo().name();
+- pluginSelector->addPlugins( QList<KPluginInfo>() << plugin->pluginInfo(),
++ categoryNames[ plugin->category() ] = plugin->categoryName();
++ }
++
++ // add all plugins in each category
++ foreach( const QString &category, categoryNames.keys() ) {
++ QList<KPluginInfo> plugins;
++
++ foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) {
++ if ( plugin->category() == category ) {
++ plugins << plugin->pluginInfo();
++ kDebug() << "Adding plugin" << plugin->pluginInfo().name();
++ }
++ }
++ pluginSelector->addPlugins( plugins,
+ KPluginSelector::ReadConfigFile,
+- plugin->categoryName(),
+- plugin->category() );
++ categoryNames[ category ],
++ category
++ );
+ }
+ }
+