2 files changed, 17 insertions, 9 deletions
diff --git a/tools/assistant/tools/qhelpconverter/adpreader.cpp b/tools/assistant/tools/qhelpconverter/adpreader.cpp
index 35f8878..c427038 100644
--- a/tools/assistant/tools/qhelpconverter/adpreader.cpp
+++ b/tools/assistant/tools/qhelpconverter/adpreader.cpp
@@ -39,8 +39,16 @@
 **
 ****************************************************************************/
 
+#include <QRegExp>
+
 #include "adpreader.h"
 
+static bool versionIsAtLeast320(const QString &version)
+{
+    return QRegExp("\\d.\\d\\.\\d").exactMatch(version)
+            && (version[0] > '3' || (version[0] == '3' && version[2] >= '2'));
+}
+
 QT_BEGIN_NAMESPACE
 
 void AdpReader::readData(const QByteArray &contents)
@@ -51,11 +59,11 @@ void AdpReader::readData(const QByteArray &contents)
     m_properties.clear();
     m_files.clear();
     addData(contents);
-	while (!atEnd()) {
-		readNext();
-		if (isStartElement()) {
+    while (!atEnd()) {
+        readNext();
+        if (isStartElement()) {
             if (name().toString().toLower() == QLatin1String("assistantconfig")
-                && attributes().value(QLatin1String("version")) == QLatin1String("3.2.0")) {
+                && versionIsAtLeast320(attributes().value(QLatin1String("version")).toString())) {
                 readProject();
             } else if (name().toString().toLower() == QLatin1String("dcf")) {
                 QString ref = attributes().value(QLatin1String("ref")).toString();
@@ -66,8 +74,8 @@ void AdpReader::readData(const QByteArray &contents)
             } else {
                 raiseError();
             }
-		}
-	}
+        }
+    }
 }
 
 QList<ContentItem> AdpReader::contents() const
diff --git a/tools/assistant/tools/qhelpconverter/adpreader.h b/tools/assistant/tools/qhelpconverter/adpreader.h
index f2e7509..740a462 100644
--- a/tools/assistant/tools/qhelpconverter/adpreader.h
+++ b/tools/assistant/tools/qhelpconverter/adpreader.h
@@ -50,15 +50,15 @@ QT_BEGIN_NAMESPACE
 
 struct ContentItem {
     ContentItem(const QString &t, const QString &r, int d)
-	: title(t), reference(r), depth(d) {}
+       : title(t), reference(r), depth(d) {}
     QString title;
     QString reference;
-    int depth;    
+    int depth;
 };
 
 struct KeywordItem {
     KeywordItem(const QString &k, const QString &r)
-	: keyword(k), reference(r) {}
+       : keyword(k), reference(r) {}
     QString keyword;
     QString reference;
 };