Make sure to parse the user's custom profiles at the end, so that they can override...

svn path=/branches/KDE4/; revision=3085

diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp
index 65e1ce8d9b77455ce97b444f5e788259625c28cb..4cf779ed5849e7d4b4963f359a463e738b2ba583 100644 (file)
--- a/src/renderwidget.cpp
+++ b/src/renderwidget.cpp
@@ -854,9 +854,13 @@ void RenderWidget::parseProfiles(QString meta, QString group, QString profile) {
     QDir directory = QDir(exportFolder);
     QStringList filter;
     filter << "*.xml";
-    const QStringList fileList = directory.entryList(filter, QDir::Files);
+    QStringList fileList = directory.entryList(filter, QDir::Files);
+    // We should parse customprofiles.xml in last position, so that user profiles
+    // can also override profiles installed by KNewStuff
+    fileList.removeAll("customprofiles.xml");
     foreach(const QString filename, fileList)
-    parseFile(exportFolder + '/' + filename, true); //filename == "customprofiles.xml");
+    parseFile(exportFolder + '/' + filename, true);
+    if (QFile::exists(exportFolder + "/customprofiles.xml")) parseFile(exportFolder + "/customprofiles.xml", true);
 
     if (!meta.isEmpty()) {
         m_view.destination_list->blockSignals(true);