Merge lp:~zeller-benjamin/qtcreator-plugin-remotelinux/qt53migrate into lp:qtcreator-plugin-remotelinux

[Benjamin Zeller]

Migrating to Qt5.3 and QtC 3.1

Migrating to Qt5.3 and QtC 3.1

[lp:~zeller-benjamin/qtcreator-plugin-remotelinux/qt53migrate]

11. By Benjamin Zeller on 2014-06-16

Update package versions

12. By Benjamin Zeller on 2014-06-16

Merge

13. By Benjamin Zeller on 2014-06-16

Version bump

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-09 08:00:41 +0000
+++ debian/changelog	2014-06-16 09:46:37 +0000
@@ -1,3 +1,9 @@
+qtcreator-plugin-remotelinux (3.1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Migrating to Qt5.3 and QtC 3.1
+
+ -- Benjamin Zeller <[e-mail]>  Mon, 16 Jun 2014 11:45:02 +0200
+
 qtcreator-plugin-remotelinux (3.0.1+14.10.20140609-0ubuntu1) utopic; urgency=low
 
   [ Benjamin Zeller ]
 
=== modified file 'debian/control'
--- debian/control	2014-04-09 11:27:44 +0000
+++ debian/control	2014-06-16 09:46:37 +0000
@@ -4,12 +4,12 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
                libqt5webkit5-dev,
-               libqt5widgets5 (>= 5.0.2~),
+               libqt5widgets5 (>= 5.3.0~),
                libsqlite3-dev,
-               qt5-qmake (>= 5.2.1~),
-               qtcreator-dev (>= 3.0.1-0ubuntu3),
-               qttools5-dev-tools (>= 5.2.1~),
-               qtbase5-private-dev (>= 5.2.1~),
+               qt5-qmake (>= 5.3.0~),
+               qtcreator-dev (>= 3.1.0),
+               qttools5-dev-tools (>= 5.3.0~),
+               qtbase5-private-dev (>= 5.3.0~),
                qtxmlpatterns5-dev-tools,
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/qtcreator-plugin-remotelinux
 
=== modified file 'share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml'
--- share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml	2014-03-20 10:59:28 +0000
+++ share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml	2014-06-16 09:46:37 +0000
@@ -13,11 +13,9 @@
     </initialWindow>
     <publisher>PUBLISHER</publisher>
     <copyright>COPYRIGHT</copyright>
-    <env var="QML_IMPORT_PATH" value="app/native/imports:/usr/lib/qt4/imports"/>
-    <env var="QT_PLUGIN_PATH" value="app/native/plugins:/usr/lib/qt4/plugins"/>
-    <env var="LD_LIBRARY_PATH" value="app/native/lib:/usr/lib/qt4/lib/"/>
     <arg>-style</arg>
-    <arg>qnxlight</arg>
+    <!-- available styles are bb10dark and bb10bright -->
+    <arg>bb10dark</arg>
 
     <action system="true">run_native</action>
 
 
=== modified file 'share/qtcreator/templates/wizards/bb-cascades-app/bar-descriptor.xml'
--- share/qtcreator/templates/wizards/bb-cascades-app/bar-descriptor.xml	2014-03-20 10:59:28 +0000
+++ share/qtcreator/templates/wizards/bb-cascades-app/bar-descriptor.xml	2014-06-16 09:46:37 +0000
@@ -17,8 +17,6 @@
         <image>icon.png</image>
     </icon>
 
-    <env value="app/native/lib:/usr/lib/qt4/lib/" var="LD_LIBRARY_PATH"/>
-
     <action system="true">run_native</action>
 
     <!-- Application assets -->
 
=== modified file 'share/qtcreator/templates/wizards/bb-cascades-app/wizard.xml'
--- share/qtcreator/templates/wizards/bb-cascades-app/wizard.xml	2014-03-20 10:59:28 +0000
+++ share/qtcreator/templates/wizards/bb-cascades-app/wizard.xml	2014-06-16 09:46:37 +0000
@@ -31,7 +31,7 @@
 **************************************************************************/
 -->
 <wizard version="1" kind="project"
-        class="qt4project" firstpage="10"
+        class="qmakeproject" firstpage="10"
         id="Q.QnxBlackBerryCascadesApp" category="F.QtApplications"
         featuresRequired="QtSupport.Wizards.FeatureBlackBerry">
     <icon>icon.png</icon>
 
=== modified file 'share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml'
--- share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml	2014-03-20 10:59:28 +0000
+++ share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml	2014-06-16 09:46:37 +0000
@@ -14,29 +14,7 @@
         <aspectRatio>landscape</aspectRatio>
     </initialWindow>
 
-    <env var="QML2_IMPORT_PATH" value="app/native/imports"/>
-    <env var="QT_PLUGIN_PATH" value="app/native/plugins"/>
-    <env var="LD_LIBRARY_PATH" value="app/native/lib"/>
-
-    <arg>-platform</arg>
-    <arg>qnx</arg>
-
     <action system="true">run_native</action>
 
     <asset entry="true" path="PROJECTPATH" type="Qnx/Elf">PROJECTNAME</asset>
-
-    <!--
-         %QT_INSTALL_LIBS%, %QT_INSTALL_PLUGINS, %QT_INSTALL_QML% and %SRC_DIR%
-         tags are replaced on-the-fly when deploying the app. in Qt Creator.
-    -->
-    <asset path="%QT_INSTALL_LIBS%">lib</asset>
-    <asset path="%QT_INSTALL_PLUGINS%">plugins</asset>
-    <asset path="%QT_INSTALL_QML%">imports</asset>
-
-    <!--
-         By default this bar-descriptor.xml embeds Qt5 runtime
-         into the application itself. See the following document
-         for various deployments of Qt runtime to a device:
-         http://qt-project.org/wiki/Qt-on-BlackBerry-devices
-    -->
 </qnx>
 
=== modified file 'src/qnx/bardescriptordocument.cpp'
--- src/qnx/bardescriptordocument.cpp	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptordocument.cpp	2014-06-16 09:46:37 +0000
@@ -32,47 +32,22 @@
 #include "bardescriptordocument.h"
 
 #include "qnxconstants.h"
-#include "bardescriptoreditor.h"
-#include "bardescriptoreditorwidget.h"
-#include "bardescriptordocumentnodehandlers.h"
 
-#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <utils/qtcassert.h>
 
-#include <QFile>
+#include <QDir>
 #include <QFileInfo>
-#include <QDir>
+#include <QMetaEnum>
 #include <QTextCodec>
+#include <QSet>
 
 using namespace Qnx;
 using namespace Qnx::Internal;
 
-BarDescriptorDocument::BarDescriptorDocument(BarDescriptorEditorWidget *editorWidget)
-    : Core::TextDocument(editorWidget)
-    , m_nodeHandlers(QList<BarDescriptorDocumentAbstractNodeHandler *>())
-    , m_editorWidget(editorWidget)
+BarDescriptorDocument::BarDescriptorDocument(QObject *parent)
+    : Core::TextDocument(parent)
 {
-    // General
-    registerNodeHandler(new BarDescriptorDocumentIdNodeHandler(m_editorWidget));
-    registerNodeHandler(new BarDescriptorDocumentVersionNumberNodeHandler(m_editorWidget));
-    registerNodeHandler(new BarDescriptorDocumentBuildIdNodeHandler(m_editorWidget));
-    registerNodeHandler(new BarDescriptorDocumentAuthorNodeHandler(m_editorWidget));
-    registerNodeHandler(new BarDescriptorDocumentAuthorIdNodeHandler(m_editorWidget));
-
-    // Application
-    registerNodeHandler(new BarDescriptorDocumentApplicationNameNodeHandler(m_editorWidget));
-    registerNodeHandler(new BarDescriptorDocumentApplicationDescriptionNodeHandler(m_editorWidget));
-    registerNodeHandler(new BarDescriptorDocumentApplicationIconNodeHandler(m_editorWidget));
-    registerNodeHandler(new BarDescriptorDocumentSplashScreenNodeHandler(m_editorWidget));
-    registerNodeHandler(new BarDescriptorDocumentInitialWindowNodeHandler(m_editorWidget));
-    registerNodeHandler(new BarDescriptorDocumentArgNodeHandler(m_editorWidget));
-    registerNodeHandler(new BarDescriptorDocumentActionNodeHandler(m_editorWidget));
-    registerNodeHandler(new BarDescriptorDocumentEnvNodeHandler(m_editorWidget));
-
-    // Assets
-    registerNodeHandler(new BarDescriptorDocumentAssetNodeHandler(m_editorWidget));
-
     // blackberry-nativepackager requires the XML file to be in UTF-8 encoding,
     // force if possible
     if (QTextCodec *defaultUTF8 = QTextCodec::codecForName("UTF-8"))
@@ -83,10 +58,6 @@
 
 BarDescriptorDocument::~BarDescriptorDocument()
 {
-    while (!m_nodeHandlers.isEmpty()) {
-        BarDescriptorDocumentAbstractNodeHandler *nodeHandler = m_nodeHandlers.takeFirst();
-        delete nodeHandler;
-    }
 }
 
 bool BarDescriptorDocument::open(QString *errorString, const QString &fileName) {
@@ -95,9 +66,8 @@
         return false;
 
     setFilePath(fileName);
-    m_editorWidget->setFilePath(fileName);
 
-    bool result = loadContent(contents);
+    const bool result = loadContent(contents, false);
 
     if (!result)
         *errorString = tr("%1 does not appear to be a valid application descriptor file").arg(QDir::toNativeSeparators(fileName));
@@ -110,12 +80,12 @@
     QTC_ASSERT(!autoSave, return false);
     QTC_ASSERT(fn.isEmpty(), return false);
 
-    bool result = write(filePath(), xmlSource(), errorString);
+    const bool result = write(filePath(), xmlSource(), errorString);
     if (!result)
         return false;
 
-    m_editorWidget->setDirty(false);
-    emit changed();
+    m_dirty = false;
+    emit Core::IDocument::changed();
     return true;
 }
 
@@ -143,7 +113,7 @@
 
 bool BarDescriptorDocument::isModified() const
 {
-    return m_editorWidget->isDirty();
+    return m_dirty;
 }
 
 bool BarDescriptorDocument::isSaveAsAllowed() const
@@ -172,91 +142,553 @@
 
 QString BarDescriptorDocument::xmlSource() const
 {
-    BarDescriptorEditor *editor = qobject_cast<BarDescriptorEditor*>(m_editorWidget->editor());
-    QTC_ASSERT(editor, return QString());
-
-    if (editor->activePage() == BarDescriptorEditor::Source) {
-        return m_editorWidget->xmlSource();
-    } else {
-        QDomDocument doc;
-        doc.appendChild(doc.createProcessingInstruction(QLatin1String("xml"), QLatin1String("version='1.0' encoding='") + QLatin1String(codec()->name()) + QLatin1String("' standalone='no'")));
-
-        // QNX
-        QDomElement rootElem = doc.createElement(QLatin1String("qnx"));
-        rootElem.setAttribute(QLatin1String("xmlns"), QLatin1String("http://www.qnx.com/schemas/application/1.0"));
-
-        QMap<int, BarDescriptorDocumentAbstractNodeHandler*> nodeHandlerMap;
-        foreach (BarDescriptorDocumentAbstractNodeHandler *nodeHandler, m_nodeHandlers)
-            nodeHandlerMap.insertMulti(nodeHandler->order(), nodeHandler);
-
-        QList<BarDescriptorDocumentAbstractNodeHandler*> nodeHandlers = nodeHandlerMap.values();
-        foreach (BarDescriptorDocumentAbstractNodeHandler *nodeHandler, nodeHandlers)
-            rootElem.appendChild(nodeHandler->toNode(doc));
-
-        doc.appendChild(rootElem);
-
-        return doc.toString(4);
-    }
-}
-
-bool BarDescriptorDocument::loadContent(const QString &xmlSource, QString *errorMessage, int *errorLine)
-{
-    QDomDocument doc;
-    bool result = doc.setContent(xmlSource, errorMessage, errorLine);
-    if (!result)
-        return false;
-
-    QDomElement docElem = doc.documentElement();
-    if (docElem.tagName() != QLatin1String("qnx"))
-        return false;
-
-    m_editorWidget->clear();
-
-    removeUnknownNodeHandlers();
-    foreach (BarDescriptorDocumentAbstractNodeHandler *nodeHandler, m_nodeHandlers)
-        nodeHandler->clear();
-
-    QDomNode node = docElem.firstChildElement();
-    while (!node.isNull()) {
-        BarDescriptorDocumentAbstractNodeHandler *nodeHandler = nodeHandlerForDomNode(node);
-        if (!nodeHandler) {
-            nodeHandler = new BarDescriptorDocumentUnknownNodeHandler(m_editorWidget);
-            registerNodeHandler(nodeHandler);
-        }
-
-        if (!nodeHandler->handle(node))
-            return false;
-
-        node = node.nextSibling();
-    }
-
-    m_editorWidget->setXmlSource(xmlSource);
-
-    return true;
-}
-
-void BarDescriptorDocument::registerNodeHandler(BarDescriptorDocumentAbstractNodeHandler *nodeHandler)
-{
-    m_nodeHandlers << nodeHandler;
-}
-
-BarDescriptorDocumentAbstractNodeHandler *BarDescriptorDocument::nodeHandlerForDomNode(const QDomNode &node)
-{
-    foreach (BarDescriptorDocumentAbstractNodeHandler *handler, m_nodeHandlers) {
-        if (handler->canHandle(node) && !dynamic_cast<BarDescriptorDocumentUnknownNodeHandler*>(handler))
-            return handler;
-    }
-
-    return 0;
-}
-
-void BarDescriptorDocument::removeUnknownNodeHandlers()
-{
-    for (int i = m_nodeHandlers.size() - 1; i >= 0; --i) {
-        BarDescriptorDocumentUnknownNodeHandler *nodeHandler = dynamic_cast<BarDescriptorDocumentUnknownNodeHandler*>(m_nodeHandlers[i]);
-        if (nodeHandler) {
-            m_nodeHandlers.removeAt(i);
-            delete nodeHandler;
-        }
-    }
+    const int indent = 4;
+    return m_barDocument.toString(indent);
+}
+
+bool BarDescriptorDocument::loadContent(const QString &xmlCode, bool setDirty, QString *errorMessage, int *errorLine)
+{
+    if (xmlCode == xmlSource())
+        return true;
+
+    bool result = m_barDocument.setContent(xmlCode, errorMessage, errorLine);
+
+    m_dirty = setDirty;
+
+    emitAllChanged();
+    emit Core::IDocument::changed();
+    return result;
+}
+
+QVariant BarDescriptorDocument::value(BarDescriptorDocument::Tag tag) const
+{
+    const QString tagName = QString::fromLatin1(metaObject()->enumerator(metaObject()->enumeratorOffset()).valueToKey(tag));
+
+    switch (tag) {
+    case id:
+    case versionNumber:
+    case buildId:
+    case name:
+    case description:
+    case author:
+    case publisher:
+    case authorId:
+        return stringValue(tagName);
+    case icon:
+        return childStringListValue(tagName, QLatin1String("image")).value(0);
+    case splashScreens:
+        return childStringListValue(tagName, QLatin1String("image"));
+    case asset: {
+        QVariant var;
+        var.setValue(assets());
+        return var;
+    }
+    case aspectRatio:
+    case autoOrients:
+    case systemChrome:
+        return childStringListValue(QLatin1String("initialWindow"), tagName).value(0);
+    case transparent:
+        return childStringListValue(QLatin1String("initialWindow"), tagName).value(0) == QLatin1String("true");
+    case arg:
+    case action:
+        return stringListValue(tagName);
+    case env:
+        QVariant var;
+        var.setValue(environment());
+        return var;
+    }
+
+    return QVariant();
+}
+
+void BarDescriptorDocument::setValue(BarDescriptorDocument::Tag tag, const QVariant &value)
+{
+    const QMetaEnum tagEnum = metaObject()->enumerator(metaObject()->enumeratorOffset());
+    const QString tagName = QString::fromLatin1(tagEnum.valueToKey(tag));
+
+    switch (tag) {
+    case id:
+    case versionNumber:
+    case buildId:
+    case name:
+    case description:
+    case authorId:
+        setStringValue(tagName, value.toString());
+        break;
+    case icon:
+    case splashScreens:
+        setChildStringListValue(tagName, QLatin1String("image"), value.toStringList());
+        break;
+    case asset:
+        setAssets(value.value<BarDescriptorAssetList>());
+        break;
+    case aspectRatio:
+    case autoOrients:
+    case systemChrome:
+        setChildStringListValue(QLatin1String("initialWindow"), tagName, value.toStringList());
+        break;
+    case transparent:
+        setChildStringListValue(QLatin1String("initialWindow"), tagName, QStringList() << (value.toBool() ? QLatin1String("true") : QLatin1String("false")));
+        break;
+    case arg:
+    case action:
+        setStringListValue(tagName, value.toStringList());
+        break;
+    case env:
+        setEnvironment(value.value<QList<Utils::EnvironmentItem> >());
+        break;
+    case author:
+    case publisher:
+        // Unset <publisher> when setting <author> as only one should be used
+        setStringValue(QString::fromLatin1(tagEnum.valueToKey(author)), value.toString());
+        setStringValue(QString::fromLatin1(tagEnum.valueToKey(publisher)), QLatin1String(""));
+        break;
+    }
+
+    m_dirty = true;
+    emit changed(tag, value);
+    emit Core::IDocument::changed();
+}
+
+QString BarDescriptorDocument::stringValue(const QString &tagName) const
+{
+    QDomNodeList nodes = m_barDocument.elementsByTagName(tagName);
+    if (nodes.isEmpty() || nodes.size() > 1)
+        return QString();
+
+    QDomNode node = nodes.item(0);
+    QDomText textNode = node.firstChild().toText();
+    if (textNode.isNull())
+        return QString();
+
+    return textNode.data();
+}
+
+void BarDescriptorDocument::setStringValue(const QString &tagName, const QString &value)
+{
+    QDomNodeList nodes = m_barDocument.elementsByTagName(tagName);
+
+    if (nodes.size() > 1)
+        return;
+
+    QDomNode existingNode = nodes.item(0);
+    if (existingNode.isNull() && value.isEmpty())
+        return;
+
+    if (!existingNode.isNull() && value.isEmpty()) {
+        m_barDocument.documentElement().removeChild(existingNode);
+    } else if (existingNode.isNull()) {
+        QDomElement newNode = m_barDocument.createElement(tagName);
+        newNode.appendChild(m_barDocument.createTextNode(value));
+        m_barDocument.documentElement().appendChild(newNode);
+    } else {
+        QDomText textNode = existingNode.firstChild().toText();
+        if (textNode.isNull())
+            return;
+        textNode.setData(value);
+    }
+}
+
+QStringList BarDescriptorDocument::childStringListValue(const QString &tagName, const QString &childTagName) const
+{
+    QDomNodeList nodes = m_barDocument.elementsByTagName(tagName);
+    if (nodes.isEmpty() || nodes.size() > 1)
+        return QStringList();
+
+    QDomNode parentNode = nodes.item(0);
+    QDomElement childElm = parentNode.firstChildElement(childTagName);
+    if (childElm.isNull())
+        return QStringList();
+
+    QStringList result;
+    while (!childElm.isNull()) {
+        QDomText textNode = childElm.firstChild().toText();
+        if (textNode.isNull())
+            return QStringList();
+
+        result.append(textNode.data());
+
+        childElm = childElm.nextSiblingElement(childTagName);
+    }
+
+    return result;
+}
+
+void BarDescriptorDocument::setChildStringListValue(const QString &tagName, const QString &childTagName, const QStringList &stringList)
+{
+    QDomNodeList nodes = m_barDocument.elementsByTagName(tagName);
+
+    if (nodes.size() > 1)
+        return;
+
+    QDomNode existingNode = nodes.item(0);
+
+    if (existingNode.isNull()) {
+        QDomElement newParentNode = m_barDocument.createElement(tagName);
+
+        foreach (const QString &value, stringList) {
+            QDomElement newChildNode = m_barDocument.createElement(childTagName);
+            QDomText newTextNode = m_barDocument.createTextNode(value);
+            newChildNode.appendChild(newTextNode);
+            newParentNode.appendChild(newChildNode);
+        }
+        m_barDocument.documentElement().appendChild(newParentNode);
+    } else {
+        QStringList values = stringList;
+        QDomElement childElm = existingNode.firstChildElement(childTagName);
+        if (!childElm.isNull()) {
+            // Loop through existing elements, remove the existing nodes
+            // that no longer are in "values", and remove from "values"
+            // the existing nodes that don't need re-creation
+            while (!childElm.isNull()) {
+                QDomText textNode = childElm.firstChild().toText();
+                if (textNode.isNull())
+                    continue;
+
+                QDomElement toRemove;
+                if (!values.contains(textNode.data()))
+                    toRemove = childElm;
+                else
+                    values.removeAll(textNode.data());
+
+                childElm = childElm.nextSiblingElement(childTagName);
+
+                if (!toRemove.isNull())
+                    existingNode.removeChild(toRemove);
+            }
+        }
+
+        // Add the new elements
+        int newElementCount = 0;
+        foreach (const QString &value, values) {
+            if (value.isEmpty())
+                continue;
+            QDomElement newChildNode = m_barDocument.createElement(childTagName);
+            newChildNode.appendChild(m_barDocument.createTextNode(value));
+            existingNode.appendChild(newChildNode);
+            ++newElementCount;
+        }
+
+        if (newElementCount == 0)
+            m_barDocument.documentElement().removeChild(existingNode);
+    }
+}
+
+QStringList BarDescriptorDocument::stringListValue(const QString &tagName) const
+{
+    QStringList result;
+
+    QDomElement childElm = m_barDocument.documentElement().firstChildElement(tagName);
+    while (!childElm.isNull()) {
+        QDomText textNode = childElm.firstChild().toText();
+        if (textNode.isNull())
+            continue;
+
+        result.append(textNode.data());
+
+        childElm = childElm.nextSiblingElement(tagName);
+    }
+
+    return result;
+}
+
+void BarDescriptorDocument::setStringListValue(const QString &tagName, const QStringList &stringList)
+{
+    QStringList values = stringList;
+    QDomElement childElm = m_barDocument.documentElement().firstChildElement(tagName);
+    if (!childElm.isNull()) {
+        // Loop through existing elements, remove the existing nodes
+        // that no longer are in "values", and remove from "values"
+        // the existing nodes that don't need re-creation
+        while (!childElm.isNull()) {
+            QDomText textNode = childElm.firstChild().toText();
+            if (textNode.isNull())
+                continue;
+
+            QDomElement toRemove;
+            if (!values.contains(textNode.data()))
+                toRemove = childElm;
+            else
+                values.removeAll(textNode.data());
+
+            childElm = childElm.nextSiblingElement(tagName);
+
+            if (!toRemove.isNull())
+                m_barDocument.documentElement().removeChild(toRemove);
+        }
+    }
+
+    // Add the new elements
+    foreach (const QString &value, values) {
+        if (value.isEmpty())
+            continue;
+        QDomElement newChildNode = m_barDocument.createElement(tagName);
+        newChildNode.appendChild(m_barDocument.createTextNode(value));
+        m_barDocument.documentElement().appendChild(newChildNode);
+    }
+}
+
+BarDescriptorAssetList BarDescriptorDocument::assets() const
+{
+    BarDescriptorAssetList result;
+    QDomNodeList nodes = m_barDocument.elementsByTagName(QLatin1String("asset"));
+    if (nodes.isEmpty())
+        return result;
+
+    for (int i = 0; i < nodes.size(); ++i) {
+        QDomElement assetElm = nodes.item(i).toElement();
+        if (assetElm.isNull())
+            continue;
+
+        QDomText textNode = assetElm.firstChild().toText();
+        if (textNode.isNull())
+            continue;
+
+        QString path = assetElm.attribute(QLatin1String("path"));
+        QString entry = assetElm.attribute(QLatin1String("entry"));
+        QString dest = textNode.data();
+
+        BarDescriptorAsset asset;
+        asset.source = path;
+        asset.destination = dest;
+        asset.entry = entry == QLatin1String("true");
+        result.append(asset);
+    }
+
+    return result;
+}
+
+void BarDescriptorDocument::setAssets(const BarDescriptorAssetList &assets)
+{
+    QDomNodeList nodes = m_barDocument.elementsByTagName(QLatin1String("asset"));
+
+    BarDescriptorAssetList newAssets = assets;
+    QList<QDomNode> toRemove;
+
+    for (int i = 0; i < nodes.size(); ++i) {
+        QDomElement assetElm = nodes.at(i).toElement();
+        if (assetElm.isNull())
+            continue;
+
+        QDomText textNode = assetElm.firstChild().toText();
+        if (textNode.isNull())
+            continue;
+
+        QString source = assetElm.attribute(QLatin1String("path"));
+        bool found = false;
+        foreach (const BarDescriptorAsset &asset, newAssets) {
+            if (asset.source == source) {
+                found = true;
+                if (asset.entry) {
+                    assetElm.setAttribute(QLatin1String("type"), QLatin1String("Qnx/Elf"));
+                    assetElm.setAttribute(QLatin1String("entry"), QLatin1String("true"));
+                } else {
+                    assetElm.removeAttribute(QLatin1String("type"));
+                    assetElm.removeAttribute(QLatin1String("entry"));
+                }
+                textNode.setData(asset.destination);
+
+                newAssets.removeAll(asset);
+                break;
+            }
+        }
+
+        if (!found)
+            toRemove.append(assetElm);
+    }
+
+    foreach (const QDomNode &node, toRemove)
+        m_barDocument.documentElement().removeChild(node);
+
+    foreach (const BarDescriptorAsset &asset, newAssets) {
+        QDomElement assetElm = m_barDocument.createElement(QLatin1String("asset"));
+        assetElm.setAttribute(QLatin1String("path"), asset.source);
+        if (asset.entry) {
+            assetElm.setAttribute(QLatin1String("type"), QLatin1String("Qnx/Elf"));
+            assetElm.setAttribute(QLatin1String("entry"), QLatin1String("true"));
+        }
+        assetElm.appendChild(m_barDocument.createTextNode(asset.destination));
+        m_barDocument.documentElement().appendChild(assetElm);
+    }
+}
+
+QList<Utils::EnvironmentItem> BarDescriptorDocument::environment() const
+{
+    QList<Utils::EnvironmentItem> result;
+
+    QDomElement envElm = m_barDocument.documentElement().firstChildElement(QLatin1String("env"));
+    while (!envElm.isNull()) {
+        QString var = envElm.attribute(QLatin1String("var"));
+        QString value = envElm.attribute(QLatin1String("value"));
+
+        Utils::EnvironmentItem item(var, value);
+        result.append(item);
+
+        envElm = envElm.nextSiblingElement(QLatin1String("env"));
+    }
+    return result;
+}
+
+void BarDescriptorDocument::setEnvironment(const QList<Utils::EnvironmentItem> &environment)
+{
+    QDomNodeList envNodes = m_barDocument.elementsByTagName(QLatin1String("env"));
+
+    QList<Utils::EnvironmentItem> newEnvironment = environment;
+    QList<QDomElement> toRemove;
+    for (int i = 0; i < envNodes.size(); ++i) {
+        QDomElement elm = envNodes.at(i).toElement();
+        if (elm.isNull())
+            continue;
+
+        QString var = elm.attribute(QLatin1String("var"));
+        bool found = false;
+        foreach (const Utils::EnvironmentItem item, newEnvironment) {
+            if (item.name == var) {
+                found = true;
+                elm.setAttribute(QLatin1String("value"), item.value);
+                newEnvironment.removeAll(item);
+                break;
+            }
+        }
+
+        if (!found)
+            toRemove.append(elm);
+    }
+
+    foreach (const QDomNode &node, toRemove)
+        m_barDocument.documentElement().removeChild(node);
+
+    foreach (const Utils::EnvironmentItem item, newEnvironment) {
+        QDomElement elm = m_barDocument.createElement(QLatin1String("env"));
+        elm.setAttribute(QLatin1String("var"), item.name);
+        elm.setAttribute(QLatin1String("value"), item.value);
+        m_barDocument.documentElement().appendChild(elm);
+    }
+}
+
+void BarDescriptorDocument::emitAllChanged()
+{
+    QMetaEnum tags = metaObject()->enumerator(metaObject()->enumeratorOffset());
+    for (int i = 0; i < tags.keyCount(); ++i) {
+        Tag tag = static_cast<Tag>(tags.value(i));
+        emit changed(tag, value(tag));
+    }
+}
+
+QString BarDescriptorDocument::bannerComment() const
+{
+    QDomNode nd = m_barDocument.firstChild();
+    QDomProcessingInstruction pi = nd.toProcessingInstruction();
+    if (!pi.isNull())
+        nd = pi.nextSibling();
+
+    return nd.toComment().data();
+}
+
+void BarDescriptorDocument::setBannerComment(const QString &commentText)
+{
+    QDomNode nd = m_barDocument.firstChild();
+    QDomProcessingInstruction pi = nd.toProcessingInstruction();
+    if (!pi.isNull())
+        nd = pi.nextSibling();
+
+    bool oldDirty = m_dirty;
+    QDomComment cnd = nd.toComment();
+    if (cnd.isNull()) {
+        if (!commentText.isEmpty()) {
+            cnd = m_barDocument.createComment(commentText);
+            m_barDocument.insertBefore(cnd, nd);
+            m_dirty = true;
+        }
+    } else {
+        if (commentText.isEmpty()) {
+            m_barDocument.removeChild(cnd);
+            m_dirty = true;
+        } else {
+            if (cnd.data() != commentText) {
+                cnd.setData(commentText);
+                m_dirty = true;
+            }
+        }
+    }
+    if (m_dirty != oldDirty)
+        emit Core::IDocument::changed();
+}
+
+int BarDescriptorDocument::tagForElement(const QDomElement &element)
+{
+    QMetaEnum tags = metaObject()->enumerator(metaObject()->enumeratorOffset());
+    QDomElement el = element;
+    while (!el.isNull()) {
+        const int n = tags.keyToValue(el.tagName().toLatin1().constData());
+        if (n > -1)
+            return n;
+        el = el.parentNode().toElement();
+    }
+    return -1;
+}
+
+bool BarDescriptorDocument::expandPlaceHolder_helper(const QDomElement &el,
+                                                     const QString &placeholderKey,
+                                                     const QString &placeholderText,
+                                                     QSet<BarDescriptorDocument::Tag> &changedTags)
+{
+    // replace attributes
+    bool elementChanged = false;
+    QDomNamedNodeMap attrs = el.attributes();
+    for (int i = 0; i < attrs.count(); ++i) {
+        QDomAttr attr = attrs.item(i).toAttr();
+        if (!attr.isNull()) {
+            QString s = attr.value();
+            s.replace(placeholderKey, placeholderText);
+            if (s != attr.value()) {
+                attr.setValue(s);
+                elementChanged = true;
+            }
+        }
+    }
+
+    bool documentChanged = false;
+    // replace text
+    for (QDomNode nd = el.firstChild(); !nd.isNull(); nd = nd.nextSibling()) {
+        QDomText txtnd = nd.toText();
+        if (!txtnd.isNull()) {
+            QString s = txtnd.data();
+            s.replace(placeholderKey, placeholderText);
+            if (s != txtnd.data()) {
+                txtnd.setData(s);
+                elementChanged = true;
+            }
+        }
+        QDomElement child = nd.toElement();
+        if (!child.isNull()) {
+            bool hit = expandPlaceHolder_helper(child, placeholderKey, placeholderText, changedTags);
+            documentChanged = documentChanged || hit;
+        }
+    }
+    if (elementChanged) {
+        int n = tagForElement(el);
+        if (n >= 0)
+            changedTags << static_cast<Tag>(n);
+    }
+    documentChanged = documentChanged || elementChanged;
+    return documentChanged;
+}
+
+void BarDescriptorDocument::expandPlaceHolders(const QHash<QString, QString> &placeholdersKeyVals)
+{
+    QSet<Tag> changedTags;
+    QHashIterator<QString, QString> it(placeholdersKeyVals);
+    bool docChanged = false;
+    while (it.hasNext()) {
+        it.next();
+        bool expanded = expandPlaceHolder_helper(m_barDocument.documentElement(),
+                                                 it.key(), it.value(), changedTags);
+        docChanged = docChanged || expanded;
+    }
+    m_dirty = m_dirty || docChanged;
+    foreach (Tag tag, changedTags)
+        emit changed(tag, value(tag));
+    if (docChanged)
+        emit Core::IDocument::changed();
 }
 
=== modified file 'src/qnx/bardescriptordocument.h'
--- src/qnx/bardescriptordocument.h	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptordocument.h	2014-06-16 09:46:37 +0000
@@ -33,8 +33,10 @@
 #define QNX_INTERNAL_BARDESCRIPTORDOCUMENT_H
 
 #include <coreplugin/textdocument.h>
+#include <utils/environment.h>
 
-#include <QDomNode>
+#include <QDomDocument>
+#include <QMetaType>
 
 namespace Qnx {
 namespace Internal {
@@ -44,16 +46,44 @@
     QString source;
     QString destination;
     bool entry;
+
+    bool operator==(const BarDescriptorAsset &asset) const
+    {
+        return source == asset.source && destination == asset.destination;
+    }
 };
 
-class BarDescriptorEditorWidget;
-class BarDescriptorDocumentAbstractNodeHandler;
+typedef QList<BarDescriptorAsset> BarDescriptorAssetList;
 
 class BarDescriptorDocument : public Core::TextDocument
 {
     Q_OBJECT
+
+    Q_ENUMS(Tag)
+
 public:
-    explicit BarDescriptorDocument(BarDescriptorEditorWidget *editorWidget);
+    enum Tag {
+        id = 0,
+        versionNumber,
+        buildId,
+        name,
+        description,
+        icon,
+        splashScreens,
+        asset,
+        aspectRatio,
+        autoOrients,
+        systemChrome,
+        transparent,
+        arg,
+        action,
+        env,
+        author,
+        publisher,
+        authorId
+    };
+
+    explicit BarDescriptorDocument(QObject *parent = 0);
     ~BarDescriptorDocument();
 
     bool open(QString *errorString, const QString &fileName);
@@ -71,19 +101,52 @@
     bool reload(QString *errorString, ReloadFlag flag, ChangeType type);
 
     QString xmlSource() const;
-    bool loadContent(const QString &xmlSource, QString *errorMessage = 0, int *errorLine = 0);
-
+    bool loadContent(const QString &xmlCode, bool setDirty, QString *errorMessage = 0, int *errorLine = 0);
+
+    QVariant value(Tag tag) const;
+
+    void expandPlaceHolders(const QHash<QString, QString> &placeholdersKeyVals);
+
+    QString bannerComment() const;
+    void setBannerComment(const QString &commentText);
+
+signals:
+    void changed(BarDescriptorDocument::Tag tag, const QVariant &value);
+
+public slots:
+    void setValue(BarDescriptorDocument::Tag tag, const QVariant &value);
 private:
-    void registerNodeHandler(BarDescriptorDocumentAbstractNodeHandler *nodeHandler);
-    BarDescriptorDocumentAbstractNodeHandler *nodeHandlerForDomNode(const QDomNode &node);
-    void removeUnknownNodeHandlers();
-
-    QList<BarDescriptorDocumentAbstractNodeHandler *> m_nodeHandlers;
-
-    BarDescriptorEditorWidget *m_editorWidget;
+    QString stringValue(const QString &tagName) const;
+    void setStringValue(const QString &tagName, const QString &value);
+
+    QStringList childStringListValue(const QString &tagName, const QString &childTagName) const;
+    void setChildStringListValue(const QString &tagName, const QString &childTagName, const QStringList &stringList);
+
+    QStringList stringListValue(const QString &tagName) const;
+    void setStringListValue(const QString &tagName, const QStringList &stringList);
+
+    BarDescriptorAssetList assets() const;
+    void setAssets(const BarDescriptorAssetList &assets);
+
+    QList<Utils::EnvironmentItem> environment() const;
+    void setEnvironment(const QList<Utils::EnvironmentItem> &environment);
+
+    int tagForElement(const QDomElement &element);
+    bool expandPlaceHolder_helper(const QDomElement &el, const QString &placeholderKey,
+                                  const QString &placeholderText,
+                                  QSet<BarDescriptorDocument::Tag> &changedTags);
+
+    void emitAllChanged();
+
+    bool m_dirty;
+    QDomDocument m_barDocument;
 };
 
 } // namespace Internal
 } // namespace Qnx
 
+Q_DECLARE_METATYPE(Qnx::Internal::BarDescriptorAssetList)
+Q_DECLARE_METATYPE(QList<Utils::EnvironmentItem>)
+Q_DECLARE_METATYPE(Qnx::Internal::BarDescriptorDocument::Tag)
+
 #endif // QNX_INTERNAL_BARDESCRIPTORDOCUMENT_H
 
=== removed file 'src/qnx/bardescriptordocumentnodehandlers.cpp'
--- src/qnx/bardescriptordocumentnodehandlers.cpp	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptordocumentnodehandlers.cpp	1970-01-01 00:00:00 +0000
@@ -1,708 +0,0 @@
-/**************************************************************************
-**
-** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
-**
-** Contact: BlackBerry ([e-mail])
-** Contact: KDAB ([e-mail])
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "bardescriptordocumentnodehandlers.h"
-#include "bardescriptoreditorwidget.h"
-#include "bardescriptoreditorassetswidget.h"
-#include "bardescriptoreditorauthorinformationwidget.h"
-#include "bardescriptoreditorentrypointwidget.h"
-#include "bardescriptoreditorenvironmentwidget.h"
-#include "bardescriptoreditorgeneralwidget.h"
-#include "bardescriptoreditorpackageinformationwidget.h"
-#include "bardescriptoreditorpermissionswidget.h"
-
-#include <utils/environment.h>
-#include <utils/qtcassert.h>
-
-#include <QDomNode>
-
-using namespace Qnx;
-using namespace Qnx::Internal;
-
-BarDescriptorDocumentAbstractNodeHandler::BarDescriptorDocumentAbstractNodeHandler(BarDescriptorEditorWidget *editorWidget)
-    : m_editorWidget(editorWidget)
-    , m_order(0xFFFF)
-{
-}
-
-BarDescriptorDocumentAbstractNodeHandler::~BarDescriptorDocumentAbstractNodeHandler()
-{
-}
-
-bool BarDescriptorDocumentAbstractNodeHandler::handle(const QDomNode &node)
-{
-    if (m_order == 0xFFFF)
-        m_order = node.lineNumber();
-
-    return fromNode(node);
-}
-
-void BarDescriptorDocumentAbstractNodeHandler::clear()
-{
-    m_order = 0xFFFF;
-}
-
-int BarDescriptorDocumentAbstractNodeHandler::order() const
-{
-    return m_order;
-}
-
-BarDescriptorEditorPackageInformationWidget *BarDescriptorDocumentAbstractNodeHandler::packageInformationWidget() const
-{
-    return m_editorWidget->packageInformationWidget();
-}
-
-BarDescriptorEditorAuthorInformationWidget *BarDescriptorDocumentAbstractNodeHandler::authorInformationWidget() const
-{
-    return m_editorWidget->authorInformationWidget();
-}
-
-BarDescriptorEditorEntryPointWidget *BarDescriptorDocumentAbstractNodeHandler::entryPointWidget() const
-{
-    return m_editorWidget->entryPointWidget();
-}
-
-BarDescriptorEditorGeneralWidget *BarDescriptorDocumentAbstractNodeHandler::generalWidget() const
-{
-    return m_editorWidget->generalWidget();
-}
-
-BarDescriptorEditorPermissionsWidget *BarDescriptorDocumentAbstractNodeHandler::permissionsWidget() const
-{
-    return m_editorWidget->permissionsWidget();
-}
-
-BarDescriptorEditorEnvironmentWidget *BarDescriptorDocumentAbstractNodeHandler::environmentWidget() const
-{
-    return m_editorWidget->environmentWidget();
-}
-
-BarDescriptorEditorAssetsWidget *BarDescriptorDocumentAbstractNodeHandler::assetsWidget() const
-{
-    return m_editorWidget->assetsWidget();
-}
-
-bool BarDescriptorDocumentAbstractNodeHandler::canHandleSimpleTextElement(const QDomNode &node, const QString &tagName) const
-{
-    QDomElement element = node.toElement();
-    if (element.isNull())
-        return false;
-
-    if (element.tagName().toLower() != tagName.toLower())
-        return false;
-
-    QDomText textNode = element.firstChild().toText();
-    if (textNode.isNull())
-        return false;
-
-    return true;
-}
-
-QString BarDescriptorDocumentAbstractNodeHandler::loadSimpleTextElement(const QDomNode &node)
-{
-    QDomElement element = node.toElement();
-    QDomText textNode = element.firstChild().toText();
-    return textNode.data();
-}
-
-QDomElement BarDescriptorDocumentAbstractNodeHandler::createSimpleTextElement(QDomDocument &doc, const QString &tagName, const QString &textValue) const
-{
-    if (textValue.isEmpty())
-        return QDomElement();
-
-    QDomElement elem = doc.createElement(tagName);
-    elem.appendChild(doc.createTextNode(textValue));
-    return elem;
-}
-
-// ----------------------------------------------------------------------------
-
-BarDescriptorDocumentIdNodeHandler::BarDescriptorDocumentIdNodeHandler(BarDescriptorEditorWidget *editorWidget)
-    : BarDescriptorDocumentAbstractNodeHandler(editorWidget)
-{
-}
-
-bool BarDescriptorDocumentIdNodeHandler::canHandle(const QDomNode &node) const
-{
-    return canHandleSimpleTextElement(node, QLatin1String("id"));
-}
-
-bool BarDescriptorDocumentIdNodeHandler::fromNode(const QDomNode &node)
-{
-    if (!canHandle(node))
-        return false;
-
-    packageInformationWidget()->setPackageId(loadSimpleTextElement(node));
-    return true;
-}
-
-QDomNode BarDescriptorDocumentIdNodeHandler::toNode(QDomDocument &doc) const
-{
-    return createSimpleTextElement(doc, QLatin1String("id"), packageInformationWidget()->packageId());
-}
-
-// ----------------------------------------------------------------------------
-
-BarDescriptorDocumentVersionNumberNodeHandler::BarDescriptorDocumentVersionNumberNodeHandler(BarDescriptorEditorWidget *editorWidget)
-    : BarDescriptorDocumentAbstractNodeHandler(editorWidget)
-{
-}
-
-bool BarDescriptorDocumentVersionNumberNodeHandler::canHandle(const QDomNode &node) const
-{
-    return canHandleSimpleTextElement(node, QLatin1String("versionNumber"));
-}
-
-bool BarDescriptorDocumentVersionNumberNodeHandler::fromNode(const QDomNode &node)
-{
-    if (!canHandle(node))
-        return false;
-
-    packageInformationWidget()->setPackageVersion(loadSimpleTextElement(node));
-    return true;
-}
-
-QDomNode BarDescriptorDocumentVersionNumberNodeHandler::toNode(QDomDocument &doc) const
-{
-    return createSimpleTextElement(doc, QLatin1String("versionNumber"), packageInformationWidget()->packageVersion());
-}
-
-// ----------------------------------------------------------------------------
-
-BarDescriptorDocumentBuildIdNodeHandler::BarDescriptorDocumentBuildIdNodeHandler(BarDescriptorEditorWidget *editorWidget)
-    : BarDescriptorDocumentAbstractNodeHandler(editorWidget)
-{
-}
-
-bool BarDescriptorDocumentBuildIdNodeHandler::canHandle(const QDomNode &node) const
-{
-    return canHandleSimpleTextElement(node, QLatin1String("buildId"));
-}
-
-bool BarDescriptorDocumentBuildIdNodeHandler::fromNode(const QDomNode &node)
-{
-    if (!canHandle(node))
-        return false;
-
-    packageInformationWidget()->setPackageBuildId(loadSimpleTextElement(node));
-    return true;
-}
-
-QDomNode BarDescriptorDocumentBuildIdNodeHandler::toNode(QDomDocument &doc) const
-{
-    return createSimpleTextElement(doc, QLatin1String("buildId"), packageInformationWidget()->packageBuildId());
-}
-
-// ----------------------------------------------------------------------------
-
-BarDescriptorDocumentApplicationNameNodeHandler::BarDescriptorDocumentApplicationNameNodeHandler(BarDescriptorEditorWidget *editorWidget)
-    : BarDescriptorDocumentAbstractNodeHandler(editorWidget)
-{
-}
-
-bool BarDescriptorDocumentApplicationNameNodeHandler::canHandle(const QDomNode &node) const
-{
-    return canHandleSimpleTextElement(node, QLatin1String("name"));
-}
-
-bool BarDescriptorDocumentApplicationNameNodeHandler::fromNode(const QDomNode &node)
-{
-    // TODO: Add support for localization
-
-    if (!canHandle(node))
-        return false;
-
-    entryPointWidget()->setApplicationName(loadSimpleTextElement(node));
-    return true;
-}
-
-QDomNode BarDescriptorDocumentApplicationNameNodeHandler::toNode(QDomDocument &doc) const
-{
-    // TODO: Add support for localization
-
-    return createSimpleTextElement(doc, QLatin1String("name"), entryPointWidget()->applicationName());
-}
-
-// ----------------------------------------------------------------------------
-
-BarDescriptorDocumentApplicationDescriptionNodeHandler::BarDescriptorDocumentApplicationDescriptionNodeHandler(BarDescriptorEditorWidget *editorWidget)
-    : BarDescriptorDocumentAbstractNodeHandler(editorWidget)
-{
-}
-
-bool BarDescriptorDocumentApplicationDescriptionNodeHandler::canHandle(const QDomNode &node) const
-{
-    return canHandleSimpleTextElement(node, QLatin1String("description"));
-}
-
-bool BarDescriptorDocumentApplicationDescriptionNodeHandler::fromNode(const QDomNode &node)
-{
-    // TODO: Add support for localization
-
-    if (!canHandle(node))
-        return false;
-
-    entryPointWidget()->setApplicationDescription(loadSimpleTextElement(node));
-    return true;
-}
-
-QDomNode BarDescriptorDocumentApplicationDescriptionNodeHandler::toNode(QDomDocument &doc) const
-{
-    return createSimpleTextElement(doc, QLatin1String("description"), entryPointWidget()->applicationDescription());
-}
-
-// ----------------------------------------------------------------------------
-
-BarDescriptorDocumentApplicationIconNodeHandler::BarDescriptorDocumentApplicationIconNodeHandler(BarDescriptorEditorWidget *editorWidget)
-    : BarDescriptorDocumentAbstractNodeHandler(editorWidget)
-{
-}
-
-bool BarDescriptorDocumentApplicationIconNodeHandler::canHandle(const QDomNode &node) const
-{
-    QDomElement element = node.toElement();
-    if (element.isNull())
-        return false;
-
-    if (element.tagName() != QLatin1String("icon"))
-        return false;
-
-    QDomElement imageElement = element.firstChild().toElement();
-    if (imageElement.isNull())
-        return false;
-
-    if (imageElement.tagName() != QLatin1String("image"))
-        return false;
-
-    QDomText imageTextNode = imageElement.firstChild().toText();
-    if (imageTextNode.isNull())
-        return false;
-
-    return true;
-}
-
-bool BarDescriptorDocumentApplicationIconNodeHandler::fromNode(const QDomNode &node)
-{
-    // TODO: Add support for localization
-
-    if (!canHandle(node))
-        return false;
-
-    QDomNode imageNode = node.firstChild();
-    QDomText imageTextNode = imageNode.firstChild().toText();
-    entryPointWidget()->setApplicationIcon(imageTextNode.data());
-    return true;
-}
-
-QDomNode BarDescriptorDocumentApplicationIconNodeHandler::toNode(QDomDocument &doc) const
-{
-    // TODO: Add support for localization
-    const QString iconFileName = entryPointWidget()->applicationIconFileName();
-    if (iconFileName.isEmpty())
-        return QDomElement();
-
-    QDomElement iconElement = doc.createElement(QLatin1String("icon"));
-    iconElement.appendChild(createSimpleTextElement(doc, QLatin1String("image"), iconFileName));
-    return iconElement;
-}
-
-// ----------------------------------------------------------------------------
-
-BarDescriptorDocumentSplashScreenNodeHandler::BarDescriptorDocumentSplashScreenNodeHandler(BarDescriptorEditorWidget *editorWidget)
-    : BarDescriptorDocumentAbstractNodeHandler(editorWidget)
-{
-}
-
-bool BarDescriptorDocumentSplashScreenNodeHandler::canHandle(const QDomNode &node) const
-{
-    QDomElement element = node.toElement();
-    if (element.isNull())
-        return false;
-
-    if (element.tagName().toLower() != QLatin1String("splashscreens"))
-        return false;
-
-    QDomElement imageElement = element.firstChild().toElement();
-    if (imageElement.isNull())
-        return false;
-
-    if (imageElement.tagName().toLower() != QLatin1String("image"))
-        return false;
-
-    QDomText imageTextNode = imageElement.firstChild().toText();
-    if (imageTextNode.isNull())
-        return false;
-
-    return true;
-}
-
-bool BarDescriptorDocumentSplashScreenNodeHandler::fromNode(const QDomNode &node)
-{
-    if (!canHandle(node))
-        return false;
-
-    QDomElement imageNode = node.firstChildElement();
-    while (!imageNode.isNull()) {
-        if (imageNode.tagName().toLower() == QLatin1String("image")) {
-            QDomText imageTextNode = imageNode.firstChild().toText();
-            entryPointWidget()->appendSplashScreen(imageTextNode.data());
-        }
-        imageNode = imageNode.nextSiblingElement();
-    }
-    return true;
-}
-
-QDomNode BarDescriptorDocumentSplashScreenNodeHandler::toNode(QDomDocument &doc) const
-{
-    QStringList splashScreens = entryPointWidget()->splashScreens();
-    if (splashScreens.isEmpty())
-        return QDomElement();
-
-    QDomElement splashScreenElement = doc.createElement(QLatin1String("splashScreens"));
-    foreach (const QString &splashScreen, splashScreens)
-        splashScreenElement.appendChild(createSimpleTextElement(doc, QLatin1String("image"), splashScreen));
-
-    return splashScreenElement;
-}
-
-// ----------------------------------------------------------------------------
-
-BarDescriptorDocumentAssetNodeHandler::BarDescriptorDocumentAssetNodeHandler(BarDescriptorEditorWidget *editorWidget)
-    : BarDescriptorDocumentAbstractNodeHandler(editorWidget)
-{
-}
-
-bool BarDescriptorDocumentAssetNodeHandler::canHandle(const QDomNode &node) const
-{
-    return canHandleSimpleTextElement(node, QLatin1String("asset"));
-}
-
-bool BarDescriptorDocumentAssetNodeHandler::fromNode(const QDomNode &node)
-{
-    if (!canHandle(node))
-        return false;
-
-    QDomElement element = node.toElement();
-
-    QString path = element.attribute(QLatin1String("path"));
-    QString entry = element.attribute(QLatin1String("entry"));
-    QDomText destNode = element.firstChild().toText();
-    QString dest = destNode.data();
-
-    BarDescriptorAsset asset;
-    asset.source = path;
-    asset.destination = dest;
-    asset.entry = entry == QLatin1String("true");
-
-    assetsWidget()->addAsset(asset);
-    return true;
-}
-
-QDomNode BarDescriptorDocumentAssetNodeHandler::toNode(QDomDocument &doc) const
-{
-    QDomDocumentFragment fragment = doc.createDocumentFragment();
-
-    QList<BarDescriptorAsset> assets = assetsWidget()->assets();
-    foreach (const BarDescriptorAsset &asset, assets) {
-        QDomElement assetElem = doc.createElement(QLatin1String("asset"));
-        assetElem.setAttribute(QLatin1String("path"), asset.source);
-        if (asset.entry) {
-            assetElem.setAttribute(QLatin1String("type"), QLatin1String("Qnx/Elf"));
-            assetElem.setAttribute(QLatin1String("entry"), QLatin1String("true"));
-        }
-        assetElem.appendChild(doc.createTextNode(asset.destination));
-        fragment.appendChild(assetElem);
-    }
-
-    return fragment;
-}
-
-// ----------------------------------------------------------------------------
-
-BarDescriptorDocumentInitialWindowNodeHandler::BarDescriptorDocumentInitialWindowNodeHandler(BarDescriptorEditorWidget *editorWidget)
-    : BarDescriptorDocumentAbstractNodeHandler(editorWidget)
-{
-}
-
-bool BarDescriptorDocumentInitialWindowNodeHandler::canHandle(const QDomNode &node) const
-{
-    QDomElement element = node.toElement();
-    if (element.isNull())
-        return false;
-
-    if (element.tagName() != QLatin1String("initialWindow"))
-        return false;
-
-    return true;
-}
-
-bool BarDescriptorDocumentInitialWindowNodeHandler::fromNode(const QDomNode &node)
-{
-    if (!canHandle(node))
-        return false;
-
-    QDomElement child = node.firstChildElement();
-    while (!child.isNull()) {
-        if (child.tagName() == QLatin1String("aspectRatio")) {
-            generalWidget()->setOrientation(loadSimpleTextElement(child));
-        } else if (child.tagName() == QLatin1String("autoOrients")) {
-            if (loadSimpleTextElement(child) == QLatin1String("true"))
-                generalWidget()->setOrientation(QLatin1String("auto-orient"));
-        } else if (child.tagName() == QLatin1String("systemChrome")) {
-            generalWidget()->setChrome(loadSimpleTextElement(child));
-        } else if (child.tagName() == QLatin1String("transparent")) {
-            const QString transparent = loadSimpleTextElement(child);
-            generalWidget()->setTransparent(transparent == QLatin1String("true"));
-        }
-        child = child.nextSiblingElement();
-    }
-
-    return true;
-}
-
-QDomNode BarDescriptorDocumentInitialWindowNodeHandler::toNode(QDomDocument &doc) const
-{
-    QDomElement element = doc.createElement(QLatin1String("initialWindow"));
-
-    if (generalWidget()->orientation() == QLatin1String("auto-orient")) {
-        element.appendChild(createSimpleTextElement(doc, QLatin1String("autoOrients"), QLatin1String("true")));
-    } else if (!generalWidget()->orientation().isEmpty()) {
-        element.appendChild(createSimpleTextElement(doc, QLatin1String("aspectRatio"), generalWidget()->orientation()));
-        element.appendChild(createSimpleTextElement(doc, QLatin1String("autoOrients"), QLatin1String("false")));
-    }
-    element.appendChild(createSimpleTextElement(doc, QLatin1String("systemChrome"), generalWidget()->chrome()));
-    element.appendChild(createSimpleTextElement(doc, QLatin1String("transparent"), generalWidget()->transparent() ? QLatin1String("true") : QLatin1String("false")));
-
-    return element;
-}
-
-// ----------------------------------------------------------------------------
-
-
-BarDescriptorDocumentActionNodeHandler::BarDescriptorDocumentActionNodeHandler(BarDescriptorEditorWidget *editorWidget)
-    : BarDescriptorDocumentAbstractNodeHandler(editorWidget)
-{
-}
-
-bool BarDescriptorDocumentActionNodeHandler::canHandle(const QDomNode &node) const
-{
-    return canHandleSimpleTextElement(node, QLatin1String("action"));
-}
-
-bool BarDescriptorDocumentActionNodeHandler::fromNode(const QDomNode &node)
-{
-    if (!canHandle(node))
-        return false;
-
-    QString value = loadSimpleTextElement(node);
-    if (value != QLatin1String("run_native")) // This has no representation in the GUI, and is always added
-        permissionsWidget()->checkPermission(value);
-
-    return true;
-}
-
-QDomNode BarDescriptorDocumentActionNodeHandler::toNode(QDomDocument &doc) const
-{
-    QDomDocumentFragment frag = doc.createDocumentFragment();
-
-    QDomElement runNativeElement = doc.createElement(QLatin1String("action"));
-    runNativeElement.setAttribute(QLatin1String("system"), QLatin1String("true"));
-    runNativeElement.appendChild(doc.createTextNode(QLatin1String("run_native")));
-    frag.appendChild(runNativeElement);
-
-    QStringList checkedIdentifiers = permissionsWidget()->checkedPermissions();
-    foreach (const QString &identifier, checkedIdentifiers)
-        frag.appendChild(createSimpleTextElement(doc, QLatin1String("action"), identifier));
-
-    return frag;
-}
-
-// ----------------------------------------------------------------------------
-
-BarDescriptorDocumentArgNodeHandler::BarDescriptorDocumentArgNodeHandler(BarDescriptorEditorWidget *editorWidget)
-    : BarDescriptorDocumentAbstractNodeHandler(editorWidget)
-{
-}
-
-bool BarDescriptorDocumentArgNodeHandler::canHandle(const QDomNode &node) const
-{
-    return canHandleSimpleTextElement(node, QLatin1String("arg"));
-}
-
-bool BarDescriptorDocumentArgNodeHandler::fromNode(const QDomNode &node)
-{
-    if (!canHandle(node))
-        return false;
-
-    generalWidget()->appendApplicationArgument(loadSimpleTextElement(node));
-    return true;
-}
-
-QDomNode BarDescriptorDocumentArgNodeHandler::toNode(QDomDocument &doc) const
-{
-    QDomDocumentFragment frag = doc.createDocumentFragment();
-
-    QStringList arguments = generalWidget()->applicationArguments();
-    foreach (const QString &argument, arguments)
-        frag.appendChild(createSimpleTextElement(doc, QLatin1String("arg"), argument));
-
-    return frag;
-}
-
-// ----------------------------------------------------------------------------
-
-BarDescriptorDocumentEnvNodeHandler::BarDescriptorDocumentEnvNodeHandler(BarDescriptorEditorWidget *editorWidget)
-    : BarDescriptorDocumentAbstractNodeHandler(editorWidget)
-{
-}
-
-bool BarDescriptorDocumentEnvNodeHandler::canHandle(const QDomNode &node) const
-{
-    QDomElement element = node.toElement();
-    if (element.isNull())
-        return false;
-
-    if (element.tagName() != QLatin1String("env"))
-        return false;
-
-    if (!element.hasAttribute(QLatin1String("var")) || !element.hasAttribute(QLatin1String("value")))
-        return false;
-
-    return true;
-}
-
-bool BarDescriptorDocumentEnvNodeHandler::fromNode(const QDomNode &node)
-{
-    if (!canHandle(node))
-        return false;
-
-    QDomElement element = node.toElement();
-
-    QString var = element.attribute(QLatin1String("var"));
-    QString value = element.attribute(QLatin1String("value"));
-
-    Utils::EnvironmentItem item(var, value);
-    environmentWidget()->appendEnvironmentItem(item);
-    return true;
-}
-
-QDomNode BarDescriptorDocumentEnvNodeHandler::toNode(QDomDocument &doc) const
-{
-    QDomDocumentFragment frag = doc.createDocumentFragment();
-    QList<Utils::EnvironmentItem> environmentItems = environmentWidget()->environment();
-
-    foreach (const Utils::EnvironmentItem &item, environmentItems) {
-        QDomElement element = doc.createElement(QLatin1String("env"));
-        element.setAttribute(QLatin1String("var"), item.name);
-        element.setAttribute(QLatin1String("value"), item.value);
-        frag.appendChild(element);
-    }
-
-    return frag;
-}
-
-// ----------------------------------------------------------------------------
-
-BarDescriptorDocumentAuthorNodeHandler::BarDescriptorDocumentAuthorNodeHandler(BarDescriptorEditorWidget *editorWidget)
-    : BarDescriptorDocumentAbstractNodeHandler(editorWidget)
-{
-}
-
-bool BarDescriptorDocumentAuthorNodeHandler::canHandle(const QDomNode &node) const
-{
-    return canHandleSimpleTextElement(node, QLatin1String("author"))
-            || canHandleSimpleTextElement(node, QLatin1String("publisher"));
-}
-
-bool BarDescriptorDocumentAuthorNodeHandler::fromNode(const QDomNode &node)
-{
-    if (!canHandle(node))
-        return false;
-
-    authorInformationWidget()->setAuthor(loadSimpleTextElement(node));
-    return true;
-}
-
-QDomNode BarDescriptorDocumentAuthorNodeHandler::toNode(QDomDocument &doc) const
-{
-    return createSimpleTextElement(doc, QLatin1String("author"), authorInformationWidget()->author());
-}
-
-// ----------------------------------------------------------------------------
-
-BarDescriptorDocumentAuthorIdNodeHandler::BarDescriptorDocumentAuthorIdNodeHandler(BarDescriptorEditorWidget *editorWidget)
-    : BarDescriptorDocumentAbstractNodeHandler(editorWidget)
-{
-}
-
-bool BarDescriptorDocumentAuthorIdNodeHandler::canHandle(const QDomNode &node) const
-{
-    return canHandleSimpleTextElement(node, QLatin1String("authorId"));
-}
-
-bool BarDescriptorDocumentAuthorIdNodeHandler::fromNode(const QDomNode &node)
-{
-    if (!canHandle(node))
-        return false;
-
-    authorInformationWidget()->setAuthorId(loadSimpleTextElement(node));
-    return true;
-}
-
-QDomNode BarDescriptorDocumentAuthorIdNodeHandler::toNode(QDomDocument &doc) const
-{
-    return createSimpleTextElement(doc, QLatin1String("authorId"), authorInformationWidget()->authorId());
-}
-
-// ----------------------------------------------------------------------------
-
-BarDescriptorDocumentUnknownNodeHandler::BarDescriptorDocumentUnknownNodeHandler(BarDescriptorEditorWidget *editorWidget)
-    : BarDescriptorDocumentAbstractNodeHandler(editorWidget)
-{
-}
-
-bool BarDescriptorDocumentUnknownNodeHandler::canHandle(const QDomNode &node) const
-{
-    Q_UNUSED(node);
-    return true;
-}
-
-bool BarDescriptorDocumentUnknownNodeHandler::fromNode(const QDomNode &node)
-{
-    m_node = node.cloneNode();
-    return true;
-}
-
-QDomNode BarDescriptorDocumentUnknownNodeHandler::toNode(QDomDocument &doc) const
-{
-    Q_UNUSED(doc);
-    return m_node;
-}
 
=== removed file 'src/qnx/bardescriptordocumentnodehandlers.h'
--- src/qnx/bardescriptordocumentnodehandlers.h	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptordocumentnodehandlers.h	1970-01-01 00:00:00 +0000
@@ -1,302 +0,0 @@
-/**************************************************************************
-**
-** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
-**
-** Contact: BlackBerry ([e-mail])
-** Contact: KDAB ([e-mail])
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#ifndef QNX_INTERNAL_BARDESCRIPTORDOCUMENTNODEHANDLERS_H
-#define QNX_INTERNAL_BARDESCRIPTORDOCUMENTNODEHANDLERS_H
-
-#include <QDomNode>
-#include <QSharedPointer>
-
-namespace Qnx {
-namespace Internal {
-
-class BarDescriptorEditorWidget;
-class BarDescriptorEditorAssetsWidget;
-class BarDescriptorEditorAuthorInformationWidget;
-class BarDescriptorEditorEntryPointWidget;
-class BarDescriptorEditorEnvironmentWidget;
-class BarDescriptorEditorGeneralWidget;
-class BarDescriptorEditorPackageInformationWidget;
-class BarDescriptorEditorPermissionsWidget;
-
-class BarDescriptorDocumentAbstractNodeHandler
-{
-public:
-    BarDescriptorDocumentAbstractNodeHandler(BarDescriptorEditorWidget *editorWidget);
-    virtual ~BarDescriptorDocumentAbstractNodeHandler();
-
-    virtual bool canHandle(const QDomNode &node) const = 0;
-    bool handle(const QDomNode &node);
-    virtual QDomNode toNode(QDomDocument &doc) const = 0;
-
-    void clear();
-    int order() const;
-
-protected:
-    BarDescriptorEditorPackageInformationWidget *packageInformationWidget() const;
-    BarDescriptorEditorAuthorInformationWidget *authorInformationWidget() const;
-
-    BarDescriptorEditorEntryPointWidget *entryPointWidget() const;
-    BarDescriptorEditorGeneralWidget *generalWidget() const;
-    BarDescriptorEditorPermissionsWidget *permissionsWidget() const;
-    BarDescriptorEditorEnvironmentWidget *environmentWidget() const;
-
-    BarDescriptorEditorAssetsWidget *assetsWidget() const;
-
-    virtual bool fromNode(const QDomNode &node) = 0;
-
-    bool canHandleSimpleTextElement(const QDomNode &node, const QString &tagName) const;
-    QString loadSimpleTextElement(const QDomNode &node);
-    QDomElement createSimpleTextElement(QDomDocument &doc, const QString &tagName, const QString &textValue) const;
-
-private:
-    BarDescriptorEditorWidget *m_editorWidget;
-
-    int m_order;
-};
-
-// ----------------------------------------------------------------------------
-
-class BarDescriptorDocumentIdNodeHandler : public BarDescriptorDocumentAbstractNodeHandler
-{
-public:
-    BarDescriptorDocumentIdNodeHandler(BarDescriptorEditorWidget *editorWidget);
-
-    bool canHandle(const QDomNode &node) const;
-    QDomNode toNode(QDomDocument &doc) const;
-
-protected:
-    bool fromNode(const QDomNode &node);
-};
-
-// ----------------------------------------------------------------------------
-
-class BarDescriptorDocumentVersionNumberNodeHandler : public BarDescriptorDocumentAbstractNodeHandler
-{
-public:
-    BarDescriptorDocumentVersionNumberNodeHandler(BarDescriptorEditorWidget *editorWidget);
-
-    bool canHandle(const QDomNode &node) const;
-    QDomNode toNode(QDomDocument &doc) const;
-
-protected:
-    bool fromNode(const QDomNode &node);
-};
-
-// ----------------------------------------------------------------------------
-
-class BarDescriptorDocumentBuildIdNodeHandler : public BarDescriptorDocumentAbstractNodeHandler
-{
-public:
-    BarDescriptorDocumentBuildIdNodeHandler(BarDescriptorEditorWidget *editorWidget);
-
-    bool canHandle(const QDomNode &node) const;
-    QDomNode toNode(QDomDocument &doc) const;
-
-protected:
-    bool fromNode(const QDomNode &node);
-};
-
-// ----------------------------------------------------------------------------
-
-class BarDescriptorDocumentApplicationNameNodeHandler : public BarDescriptorDocumentAbstractNodeHandler
-{
-public:
-    BarDescriptorDocumentApplicationNameNodeHandler(BarDescriptorEditorWidget *editorWidget);
-
-    bool canHandle(const QDomNode &node) const;
-    QDomNode toNode(QDomDocument &doc) const;
-
-protected:
-    bool fromNode(const QDomNode &node);
-};
-
-// ----------------------------------------------------------------------------
-
-class BarDescriptorDocumentApplicationDescriptionNodeHandler : public BarDescriptorDocumentAbstractNodeHandler
-{
-public:
-    BarDescriptorDocumentApplicationDescriptionNodeHandler(BarDescriptorEditorWidget *editorWidget);
-
-    bool canHandle(const QDomNode &node) const;
-    QDomNode toNode(QDomDocument &doc) const;
-
-protected:
-    bool fromNode(const QDomNode &node);
-};
-
-// ----------------------------------------------------------------------------
-
-class BarDescriptorDocumentApplicationIconNodeHandler : public BarDescriptorDocumentAbstractNodeHandler
-{
-public:
-    BarDescriptorDocumentApplicationIconNodeHandler(BarDescriptorEditorWidget *editorWidget);
-
-    bool canHandle(const QDomNode &node) const;
-    QDomNode toNode(QDomDocument &doc) const;
-
-protected:
-    bool fromNode(const QDomNode &node);
-};
-
-// ----------------------------------------------------------------------------
-
-class BarDescriptorDocumentSplashScreenNodeHandler : public BarDescriptorDocumentAbstractNodeHandler
-{
-public:
-    BarDescriptorDocumentSplashScreenNodeHandler(BarDescriptorEditorWidget *editorWidget);
-
-    bool canHandle(const QDomNode &node) const;
-    QDomNode toNode(QDomDocument &doc) const;
-
-protected:
-    bool fromNode(const QDomNode &node);
-};
-
-// ----------------------------------------------------------------------------
-
-class BarDescriptorDocumentAssetNodeHandler : public BarDescriptorDocumentAbstractNodeHandler
-{
-public:
-    BarDescriptorDocumentAssetNodeHandler(BarDescriptorEditorWidget *editorWidget);
-
-    bool canHandle(const QDomNode &node) const;
-    QDomNode toNode(QDomDocument &doc) const;
-
-protected:
-    bool fromNode(const QDomNode &node);
-};
-
-// ----------------------------------------------------------------------------
-
-class BarDescriptorDocumentInitialWindowNodeHandler : public BarDescriptorDocumentAbstractNodeHandler
-{
-public:
-    BarDescriptorDocumentInitialWindowNodeHandler(BarDescriptorEditorWidget *editorWidget);
-
-    bool canHandle(const QDomNode &node) const;
-    QDomNode toNode(QDomDocument &doc) const;
-
-protected:
-    bool fromNode(const QDomNode &node);
-};
-
-// ----------------------------------------------------------------------------
-
-class BarDescriptorDocumentActionNodeHandler : public BarDescriptorDocumentAbstractNodeHandler
-{
-public:
-    BarDescriptorDocumentActionNodeHandler(BarDescriptorEditorWidget *editorWidget);
-
-    bool canHandle(const QDomNode &node) const;
-    QDomNode toNode(QDomDocument &doc) const;
-
-protected:
-    bool fromNode(const QDomNode &node);
-};
-
-// ----------------------------------------------------------------------------
-
-class BarDescriptorDocumentArgNodeHandler : public BarDescriptorDocumentAbstractNodeHandler
-{
-public:
-    BarDescriptorDocumentArgNodeHandler(BarDescriptorEditorWidget *editorWidget);
-
-    bool canHandle(const QDomNode &node) const;
-    QDomNode toNode(QDomDocument &doc) const;
-
-protected:
-    bool fromNode(const QDomNode &node);
-};
-
-// ----------------------------------------------------------------------------
-
-class BarDescriptorDocumentEnvNodeHandler : public BarDescriptorDocumentAbstractNodeHandler
-{
-public:
-    BarDescriptorDocumentEnvNodeHandler(BarDescriptorEditorWidget *editorWidget);
-
-    bool canHandle(const QDomNode &node) const;
-    QDomNode toNode(QDomDocument &doc) const;
-
-protected:
-    bool fromNode(const QDomNode &node);
-};
-
-// ----------------------------------------------------------------------------
-
-class BarDescriptorDocumentAuthorNodeHandler : public BarDescriptorDocumentAbstractNodeHandler
-{
-public:
-    BarDescriptorDocumentAuthorNodeHandler(BarDescriptorEditorWidget *editorWidget);
-
-    bool canHandle(const QDomNode &node) const;
-    QDomNode toNode(QDomDocument &doc) const;
-
-protected:
-    bool fromNode(const QDomNode &node);
-};
-
-// ----------------------------------------------------------------------------
-
-class BarDescriptorDocumentAuthorIdNodeHandler : public BarDescriptorDocumentAbstractNodeHandler
-{
-public:
-    BarDescriptorDocumentAuthorIdNodeHandler(BarDescriptorEditorWidget *editorWidget);
-
-    bool canHandle(const QDomNode &node) const;
-    QDomNode toNode(QDomDocument &doc) const;
-
-protected:
-    bool fromNode(const QDomNode &node);
-};
-
-// ----------------------------------------------------------------------------
-
-class BarDescriptorDocumentUnknownNodeHandler : public BarDescriptorDocumentAbstractNodeHandler
-{
-public:
-    BarDescriptorDocumentUnknownNodeHandler(BarDescriptorEditorWidget *editorWidget);
-
-    bool canHandle(const QDomNode &node) const;
-    QDomNode toNode(QDomDocument &doc) const;
-
-protected:
-    bool fromNode(const QDomNode &node);
-
-private:
-    QDomNode m_node;
-};
-
-} // namespace Internal
-} // namespace Qnx
-
-#endif // QNX_INTERNAL_BARDESCRIPTORDOCUMENTNODEHANDLERS_H
 
=== modified file 'src/qnx/bardescriptoreditor.cpp'
--- src/qnx/bardescriptoreditor.cpp	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditor.cpp	2014-06-16 09:46:37 +0000
@@ -38,11 +38,15 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/task.h>
 #include <projectexplorer/taskhub.h>
-#include <utils/qtcassert.h>
 #include <texteditor/texteditorconstants.h>
 #include <texteditor/basetexteditor.h>
+#include <texteditor/tabsettings.h>
+#include <utils/linecolumnlabel.h>
+#include <utils/qtcassert.h>
 
 #include <QAction>
+#include <QStyle>
+#include <QTextBlock>
 #include <QToolBar>
 
 using namespace ProjectExplorer;
@@ -50,12 +54,14 @@
 namespace Qnx {
 namespace Internal {
 
-BarDescriptorEditor::BarDescriptorEditor(BarDescriptorEditorWidget *editorWidget)
+BarDescriptorEditor::BarDescriptorEditor()
 {
+    setId(Constants::QNX_BAR_DESCRIPTOR_EDITOR_ID);
+    m_file = new BarDescriptorDocument(this);
+
+    BarDescriptorEditorWidget *editorWidget = new BarDescriptorEditorWidget(this);
     setWidget(editorWidget);
 
-    m_file = new BarDescriptorDocument(editorWidget);
-
     m_toolBar = new QToolBar(editorWidget);
 
     m_actionGroup = new QActionGroup(this);
@@ -83,6 +89,17 @@
 
     generalAction->setChecked(true);
 
+    m_cursorPositionLabel = new Utils::LineColumnLabel;
+    const int spacing = editorWidget->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 2;
+    m_cursorPositionLabel->setContentsMargins(spacing, 0, spacing, 0);
+
+    QWidget *spacer = new QWidget;
+    spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    m_toolBar->addWidget(spacer);
+
+    m_cursorPositionAction = m_toolBar->addWidget(m_cursorPositionLabel);
+    connect(editorWidget->sourceWidget(), SIGNAL(cursorPositionChanged()), this, SLOT(updateCursorPosition()));
+
     setContext(Core::Context(Constants::QNX_BAR_DESCRIPTOR_EDITOR_CONTEXT,
             TextEditor::Constants::C_TEXTEDITOR));
 }
@@ -90,7 +107,15 @@
 bool BarDescriptorEditor::open(QString *errorString, const QString &fileName, const QString &realFileName)
 {
     QTC_ASSERT(fileName == realFileName, return false);
-    return m_file->open(errorString, fileName);
+
+    bool result = m_file->open(errorString, fileName);
+    if (result) {
+        BarDescriptorEditorWidget *editorWidget = qobject_cast<BarDescriptorEditorWidget *>(widget());
+        QTC_ASSERT(editorWidget, return false);
+        editorWidget->setFilePath(fileName);
+    }
+
+    return result;
 }
 
 Core::IDocument *BarDescriptorEditor::document()
@@ -98,11 +123,6 @@
     return m_file;
 }
 
-Core::Id BarDescriptorEditor::id() const
-{
-    return Constants::QNX_BAR_DESCRIPTOR_EDITOR_ID;
-}
-
 QWidget *BarDescriptorEditor::toolBar()
 {
     return m_toolBar;
@@ -126,32 +146,26 @@
     BarDescriptorEditorWidget *editorWidget = qobject_cast<BarDescriptorEditorWidget *>(widget());
     QTC_ASSERT(editorWidget, return);
 
-    int prevPage = editorWidget->currentIndex();
-
-    if (prevPage == page)
-        return;
-
-    if (page == Source) {
-        editorWidget->setXmlSource(m_file->xmlSource());
-    } else if (prevPage == Source) {
-        TaskHub::clearTasks(Constants::QNX_TASK_CATEGORY_BARDESCRIPTOR);
-        QString errorMsg;
-        int errorLine;
-        if (!m_file->loadContent(editorWidget->xmlSource(), &errorMsg, &errorLine)) {
-            TaskHub::addTask(Task::Error, errorMsg, Constants::QNX_TASK_CATEGORY_BARDESCRIPTOR,
-                             Utils::FileName::fromString(m_file->filePath()), errorLine);
-            TaskHub::requestPopup();
-
-            foreach (QAction *action, m_actionGroup->actions())
-                if (action->data().toInt() == Source)
-                    action->setChecked(true);
-
-            return;
-        }
-    }
-
+    m_cursorPositionAction->setVisible(page == Source);
     editorWidget->setCurrentIndex(page);
 }
 
+void BarDescriptorEditor::updateCursorPosition()
+{
+    BarDescriptorEditorWidget *editorWidget = qobject_cast<BarDescriptorEditorWidget *>(widget());
+    QTC_ASSERT(editorWidget, return);
+
+    const QTextCursor cursor = editorWidget->sourceWidget()->textCursor();
+    const QTextBlock block = cursor.block();
+    const int line = block.blockNumber() + 1;
+    const int column = cursor.position() - block.position();
+    m_cursorPositionLabel->setText(tr("Line: %1, Col: %2").arg(line)
+                                   .arg(editorWidget->sourceWidget()->baseTextDocument()
+                                        ->tabSettings().columnAt(block.text(), column)+1),
+                                   tr("Line: 9999, Col: 999"));
+    if (!block.isVisible())
+        editorWidget->sourceWidget()->ensureCursorVisible();
+}
+
 } // namespace Internal
 } // namespace Qnx
 
=== modified file 'src/qnx/bardescriptoreditor.h'
--- src/qnx/bardescriptoreditor.h	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditor.h	2014-06-16 09:46:37 +0000
@@ -39,6 +39,8 @@
 class QToolBar;
 QT_END_NAMESPACE
 
+namespace Utils { class LineColumnLabel; }
+
 namespace Qnx {
 namespace Internal {
 
@@ -56,17 +58,17 @@
         Source
     };
 
-    explicit BarDescriptorEditor(BarDescriptorEditorWidget *editorWidget);
+    BarDescriptorEditor();
 
     bool open(QString *errorString, const QString &fileName, const QString &realFileName);
     Core::IDocument *document();
-    Core::Id id() const;
     QWidget *toolBar();
 
     EditorPage activePage() const;
 
 private slots:
     void changeEditorPage(QAction *action);
+    void updateCursorPosition();
 
 private:
     void setActivePage(EditorPage page);
@@ -75,6 +77,8 @@
 
     QToolBar *m_toolBar;
     QActionGroup *m_actionGroup;
+    Utils::LineColumnLabel *m_cursorPositionLabel;
+    QAction *m_cursorPositionAction;
 };
 
 } // namespace Internal
 
=== modified file 'src/qnx/bardescriptoreditorabstractpanelwidget.cpp'
--- src/qnx/bardescriptoreditorabstractpanelwidget.cpp	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorabstractpanelwidget.cpp	2014-06-16 09:46:37 +0000
@@ -32,10 +32,12 @@
 #include "bardescriptoreditorabstractpanelwidget.h"
 
 #include <utils/pathchooser.h>
+#include <utils/qtcassert.h>
 
 #include <QCheckBox>
 #include <QComboBox>
 #include <QLineEdit>
+#include <QSignalMapper>
 #include <QTextEdit>
 
 using namespace Qnx;
@@ -44,40 +46,86 @@
 BarDescriptorEditorAbstractPanelWidget::BarDescriptorEditorAbstractPanelWidget(QWidget *parent) :
     QWidget(parent)
 {
-}
-
-
-void BarDescriptorEditorAbstractPanelWidget::setComboBoxBlocked(QComboBox *comboBox, int index)
-{
-    bool blocked = comboBox->blockSignals(true);
-    comboBox->setCurrentIndex(index);
-    comboBox->blockSignals(blocked);
-}
-
-void BarDescriptorEditorAbstractPanelWidget::setCheckBoxBlocked(QCheckBox *checkBox, bool checked)
-{
-    bool blocked = checkBox->blockSignals(true);
-    checkBox->setChecked(checked);
-    checkBox->blockSignals(blocked);
-}
-
-void BarDescriptorEditorAbstractPanelWidget::setLineEditBlocked(QLineEdit *lineEdit, const QString &text)
-{
-    bool blocked = lineEdit->blockSignals(true);
-    lineEdit->setText(text);
-    lineEdit->blockSignals(blocked);
-}
-
-void BarDescriptorEditorAbstractPanelWidget::setTextEditBlocked(QTextEdit *textEdit, const QString &text)
-{
-    bool blocked = textEdit->blockSignals(true);
-    textEdit->setPlainText(text);
-    textEdit->blockSignals(blocked);
-}
-
-void BarDescriptorEditorAbstractPanelWidget::setPathChooserBlocked(Utils::PathChooser *pathChooser, const QString &path)
-{
-    bool blocked = pathChooser->blockSignals(true);
-    pathChooser->setPath(path);
-    pathChooser->blockSignals(blocked);
+    m_signalMapper = new QSignalMapper(this);
+    connect(m_signalMapper, SIGNAL(mapped(int)), this, SLOT(handleSignalMapped(int)));
+}
+
+void BarDescriptorEditorAbstractPanelWidget::setValue(BarDescriptorDocument::Tag tag, const QVariant &value)
+{
+    if (m_blockedSignals.contains(tag))
+        return;
+
+    blockSignalMapping(tag);
+    updateWidgetValue(tag, value);
+    unblockSignalMapping(tag);
+}
+
+void BarDescriptorEditorAbstractPanelWidget::addSignalMapping(BarDescriptorDocument::Tag tag, QObject *object, const char *signal)
+{
+    m_signalMapper->setMapping(object, tag);
+    connect(object, signal, m_signalMapper, SLOT(map()));
+}
+
+void BarDescriptorEditorAbstractPanelWidget::blockSignalMapping(BarDescriptorDocument::Tag tag)
+{
+    m_blockedSignals.prepend(tag);
+}
+
+void BarDescriptorEditorAbstractPanelWidget::unblockSignalMapping(BarDescriptorDocument::Tag tag)
+{
+    BarDescriptorDocument::Tag removedTag = m_blockedSignals.takeFirst();
+    QTC_CHECK(removedTag == tag);
+}
+
+void BarDescriptorEditorAbstractPanelWidget::updateWidgetValue(BarDescriptorDocument::Tag tag, const QVariant &value)
+{
+    QObject *object = m_signalMapper->mapping(static_cast<int>(tag));
+    if (!object)
+        return;
+
+    if (QLineEdit *lineEdit = qobject_cast<QLineEdit *>(object))
+        lineEdit->setText(value.toString());
+    else if (QTextEdit *textEdit = qobject_cast<QTextEdit *>(object))
+        textEdit->setPlainText(value.toString());
+    else if (Utils::PathChooser *pathChooser = qobject_cast<Utils::PathChooser *>(object))
+        pathChooser->setPath(value.toString());
+    else if (QComboBox *comboBox = qobject_cast<QComboBox *>(object))
+        comboBox->setCurrentIndex(comboBox->findData(value.toString()));
+    else if (QCheckBox *checkBox = qobject_cast<QCheckBox *>(object))
+        checkBox->setChecked(value.toBool());
+    else
+        QTC_CHECK(false);
+}
+
+void BarDescriptorEditorAbstractPanelWidget::emitChanged(BarDescriptorDocument::Tag tag)
+{
+    QObject *sender = m_signalMapper->mapping(tag);
+
+    if (!sender)
+        return;
+
+    if (QLineEdit *lineEdit = qobject_cast<QLineEdit *>(sender))
+        emit changed(tag, lineEdit->text());
+    else if (QTextEdit *textEdit = qobject_cast<QTextEdit *>(sender))
+        emit changed(tag, textEdit->toPlainText());
+    else if (Utils::PathChooser *pathChooser = qobject_cast<Utils::PathChooser *>(sender))
+        emit changed(tag, pathChooser->path());
+    else if (QComboBox *comboBox = qobject_cast<QComboBox *>(sender))
+        emit changed(tag, comboBox->itemData(comboBox->currentIndex()));
+    else if (QCheckBox *checkBox = qobject_cast<QCheckBox *>(sender))
+        emit changed(tag, checkBox->isChecked());
+    else
+        QTC_CHECK(false);
+}
+
+void BarDescriptorEditorAbstractPanelWidget::handleSignalMapped(int id)
+{
+    BarDescriptorDocument::Tag tag = static_cast<BarDescriptorDocument::Tag>(id);
+
+    if (m_blockedSignals.contains(tag))
+        return;
+
+    blockSignalMapping(tag);
+    emitChanged(tag);
+    unblockSignalMapping(tag);
 }
 
=== modified file 'src/qnx/bardescriptoreditorabstractpanelwidget.h'
--- src/qnx/bardescriptoreditorabstractpanelwidget.h	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorabstractpanelwidget.h	2014-06-16 09:46:37 +0000
@@ -34,14 +34,16 @@
 
 #include <QWidget>
 
-namespace Utils {
-class PathChooser;
-}
+#include "bardescriptordocument.h"
+
+namespace Utils { class PathChooser; }
 
 QT_BEGIN_NAMESPACE
 class QCheckBox;
 class QComboBox;
 class QLineEdit;
+class QSignalMapper;
+class QStringListModel;
 class QTextEdit;
 QT_END_NAMESPACE
 
@@ -54,17 +56,26 @@
 public:
     explicit BarDescriptorEditorAbstractPanelWidget(QWidget *parent = 0);
 
-    virtual void clear() = 0;
+public slots:
+    void setValue(BarDescriptorDocument::Tag tag, const QVariant &value);
 
 signals:
-    void changed();
+    void changed(BarDescriptorDocument::Tag tag, const QVariant &value);
 
 protected:
-    void setComboBoxBlocked(QComboBox *comboBox, int index);
-    void setCheckBoxBlocked(QCheckBox *checkBox, bool checked);
-    void setLineEditBlocked(QLineEdit *lineEdit, const QString &text);
-    void setTextEditBlocked(QTextEdit *textEdit, const QString &text);
-    void setPathChooserBlocked(Utils::PathChooser *pathChooser, const QString &path);
+    virtual void updateWidgetValue(BarDescriptorDocument::Tag tag, const QVariant &value);
+    virtual void emitChanged(BarDescriptorDocument::Tag tag);
+
+    void addSignalMapping(BarDescriptorDocument::Tag tag, QObject *object, const char *signal);
+    void blockSignalMapping(BarDescriptorDocument::Tag tag);
+    void unblockSignalMapping(BarDescriptorDocument::Tag tag);
+
+private slots:
+    void handleSignalMapped(int id);
+
+private:
+    QSignalMapper *m_signalMapper;
+    QList<BarDescriptorDocument::Tag> m_blockedSignals;
 };
 
 } // namespace Internal
 
=== modified file 'src/qnx/bardescriptoreditorassetswidget.cpp'
--- src/qnx/bardescriptoreditorassetswidget.cpp	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorassetswidget.cpp	2014-06-16 09:46:37 +0000
@@ -57,7 +57,10 @@
     connect(m_ui->addAsset, SIGNAL(clicked()), this, SLOT(addNewAsset()));
     connect(m_ui->removeAsset, SIGNAL(clicked()), this, SLOT(removeSelectedAsset()));
     connect(m_assetsModel, SIGNAL(itemChanged(QStandardItem*)), this, SLOT(updateEntryCheckState(QStandardItem*)));
-    connectAssetsModel();
+
+    addSignalMapping(BarDescriptorDocument::asset, m_assetsModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)));
+    addSignalMapping(BarDescriptorDocument::asset, m_assetsModel, SIGNAL(rowsInserted(QModelIndex,int,int)));
+    addSignalMapping(BarDescriptorDocument::asset, m_assetsModel, SIGNAL(rowsRemoved(QModelIndex,int,int)));
 }
 
 BarDescriptorEditorAssetsWidget::~BarDescriptorEditorAssetsWidget()
@@ -67,32 +70,9 @@
 
 void BarDescriptorEditorAssetsWidget::clear()
 {
-    // We can't just block signals, as the view depends on them
-    disconnectAssetsModel();
+    blockSignalMapping(BarDescriptorDocument::asset);
     m_assetsModel->removeRows(0, m_assetsModel->rowCount());
-    connectAssetsModel();
-}
-
-void BarDescriptorEditorAssetsWidget::addAsset(const BarDescriptorAsset &asset)
-{
-    disconnectAssetsModel();
-    addAssetInternal(asset);
-    connectAssetsModel();
-}
-
-QList<BarDescriptorAsset> BarDescriptorEditorAssetsWidget::assets() const
-{
-    QList<BarDescriptorAsset> result;
-
-    for (int i = 0; i < m_assetsModel->rowCount(); ++i) {
-        BarDescriptorAsset asset;
-        asset.source = m_assetsModel->item(i, 0)->text();
-        asset.destination = m_assetsModel->item(i, 1)->text();
-        asset.entry = m_assetsModel->item(i, 2)->checkState() == Qt::Checked;
-        result << asset;
-    }
-
-    return result;
+    unblockSignalMapping(BarDescriptorDocument::asset);
 }
 
 QStandardItemModel *BarDescriptorEditorAssetsWidget::assetsModel() const
@@ -100,6 +80,19 @@
     return m_assetsModel;
 }
 
+void BarDescriptorEditorAssetsWidget::updateWidgetValue(BarDescriptorDocument::Tag tag, const QVariant &value)
+{
+    if (tag != BarDescriptorDocument::asset) {
+        BarDescriptorEditorAbstractPanelWidget::updateWidgetValue(tag, value);
+        return;
+    }
+
+    clear();
+    BarDescriptorAssetList assets = value.value<BarDescriptorAssetList>();
+    foreach (const BarDescriptorAsset asset, assets)
+        addAsset(asset);
+}
+
 void BarDescriptorEditorAssetsWidget::addAsset(const QString &fullPath)
 {
     if (fullPath.isEmpty())
@@ -109,7 +102,7 @@
     asset.source = fullPath;
     asset.destination = QFileInfo(fullPath).fileName();
     asset.entry = false;
-    addAssetInternal(asset);
+    addAsset(asset);
 }
 
 void BarDescriptorEditorAssetsWidget::removeAsset(const QString &fullPath)
@@ -157,21 +150,28 @@
     connect(m_assetsModel, SIGNAL(itemChanged(QStandardItem*)), this, SLOT(updateEntryCheckState(QStandardItem*)));
 }
 
-void BarDescriptorEditorAssetsWidget::connectAssetsModel()
-{
-    connect(m_assetsModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SIGNAL(changed()));
-    connect(m_assetsModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SIGNAL(changed()));
-    connect(m_assetsModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SIGNAL(changed()));
-}
-
-void BarDescriptorEditorAssetsWidget::disconnectAssetsModel()
-{
-    disconnect(m_assetsModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SIGNAL(changed()));
-    disconnect(m_assetsModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SIGNAL(changed()));
-    disconnect(m_assetsModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SIGNAL(changed()));
-}
-
-void BarDescriptorEditorAssetsWidget::addAssetInternal(const BarDescriptorAsset &asset)
+void BarDescriptorEditorAssetsWidget::emitChanged(BarDescriptorDocument::Tag tag)
+{
+    if (tag != BarDescriptorDocument::asset) {
+        BarDescriptorEditorAbstractPanelWidget::emitChanged(tag);
+        return;
+    }
+
+    BarDescriptorAssetList result;
+    for (int i = 0; i < m_assetsModel->rowCount(); ++i) {
+        BarDescriptorAsset asset;
+        asset.source = m_assetsModel->item(i, 0)->text();
+        asset.destination = m_assetsModel->item(i, 1)->text();
+        asset.entry = m_assetsModel->item(i, 2)->checkState() == Qt::Checked;
+        result.append(asset);
+    }
+
+    QVariant var;
+    var.setValue(result);
+    emit changed(tag, var);
+}
+
+void BarDescriptorEditorAssetsWidget::addAsset(const BarDescriptorAsset &asset)
 {
     const QString path = asset.source;
     const QString dest = asset.destination;
 
=== modified file 'src/qnx/bardescriptoreditorassetswidget.h'
--- src/qnx/bardescriptoreditorassetswidget.h	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorassetswidget.h	2014-06-16 09:46:37 +0000
@@ -42,9 +42,7 @@
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BarDescriptorEditorAssetsWidget;
-}
+namespace Ui { class BarDescriptorEditorAssetsWidget; }
 
 class BarDescriptorAsset;
 
@@ -56,27 +54,24 @@
     explicit BarDescriptorEditorAssetsWidget(QWidget *parent = 0);
     ~BarDescriptorEditorAssetsWidget();
 
-    void clear();
-
-    void addAsset(const BarDescriptorAsset &asset);
-    QList<BarDescriptorAsset> assets() const;
-
     QStandardItemModel *assetsModel() const;
 
 public slots:
     void addAsset(const QString &fullPath);
     void removeAsset(const QString &fullPath);
 
+protected:
+    void updateWidgetValue(BarDescriptorDocument::Tag tag, const QVariant &value);
+    void emitChanged(BarDescriptorDocument::Tag tag);
+
 private slots:
     void addNewAsset();
     void removeSelectedAsset();
     void updateEntryCheckState(QStandardItem *item);
 
 private:
-    void connectAssetsModel();
-    void disconnectAssetsModel();
-
-    void addAssetInternal(const BarDescriptorAsset &asset);
+    void clear();
+    void addAsset(const BarDescriptorAsset &asset);
     bool hasAsset(const BarDescriptorAsset &asset);
 
     Ui::BarDescriptorEditorAssetsWidget *m_ui;
 
=== modified file 'src/qnx/bardescriptoreditorauthorinformationwidget.cpp'
--- src/qnx/bardescriptoreditorauthorinformationwidget.cpp	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorauthorinformationwidget.cpp	2014-06-16 09:46:37 +0000
@@ -34,6 +34,7 @@
 
 #include "blackberrydebugtokenreader.h"
 #include "blackberrydeviceconfiguration.h"
+#include "blackberrysigningutils.h"
 #include "qnxconstants.h"
 
 #include <projectexplorer/devicesupport/devicemanager.h>
@@ -53,8 +54,8 @@
 
     m_ui->setFromDebugToken->setVisible(BlackBerryDebugTokenReader::isSupported());
 
-    connect(m_ui->author, SIGNAL(textChanged(QString)), this, SIGNAL(changed()));
-    connect(m_ui->authorId, SIGNAL(textChanged(QString)), this, SIGNAL(changed()));
+    addSignalMapping(BarDescriptorDocument::author, m_ui->author, SIGNAL(textChanged(QString)));
+    addSignalMapping(BarDescriptorDocument::authorId, m_ui->authorId, SIGNAL(textChanged(QString)));
     connect(m_ui->setFromDebugToken, SIGNAL(clicked()), this, SLOT(setAuthorFromDebugToken()));
 }
 
@@ -63,30 +64,13 @@
     delete m_ui;
 }
 
-void BarDescriptorEditorAuthorInformationWidget::clear()
-{
-    setLineEditBlocked(m_ui->author, QString());
-    setLineEditBlocked(m_ui->authorId, QString());
-}
-
-QString BarDescriptorEditorAuthorInformationWidget::author() const
-{
-    return m_ui->author->text();
-}
-
-void BarDescriptorEditorAuthorInformationWidget::setAuthor(const QString &author)
-{
-    setLineEditBlocked(m_ui->author, author);
-}
-
-QString BarDescriptorEditorAuthorInformationWidget::authorId() const
-{
-    return m_ui->authorId->text();
-}
-
-void BarDescriptorEditorAuthorInformationWidget::setAuthorId(const QString &authorId)
-{
-    setLineEditBlocked(m_ui->authorId, authorId);
+void BarDescriptorEditorAuthorInformationWidget::updateWidgetValue(BarDescriptorDocument::Tag tag, const QVariant &value)
+{
+    if (tag == BarDescriptorDocument::publisher && !value.toString().isEmpty())
+        // <publisher> is deprecated and hence not connected to the author field as we only want to read it from the XML
+        m_ui->author->setText(value.toString());
+    else
+        BarDescriptorEditorAbstractPanelWidget::updateWidgetValue(tag, value);
 }
 
 void BarDescriptorEditorAuthorInformationWidget::setAuthorFromDebugToken()
@@ -104,6 +88,7 @@
             debugTokens << bbDevice->debugToken();
         }
     }
+    debugTokens << BlackBerrySigningUtils::instance().debugTokens();
     debugTokens.removeDuplicates();
 
     bool ok;
 
=== modified file 'src/qnx/bardescriptoreditorauthorinformationwidget.h'
--- src/qnx/bardescriptoreditorauthorinformationwidget.h	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorauthorinformationwidget.h	2014-06-16 09:46:37 +0000
@@ -37,9 +37,7 @@
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BarDescriptorEditorAuthorInformationWidget;
-}
+namespace Ui { class BarDescriptorEditorAuthorInformationWidget; }
 
 class BarDescriptorEditorAuthorInformationWidget : public BarDescriptorEditorAbstractPanelWidget
 {
@@ -49,13 +47,8 @@
     explicit BarDescriptorEditorAuthorInformationWidget(QWidget *parent = 0);
     ~BarDescriptorEditorAuthorInformationWidget();
 
-    void clear();
-
-    QString author() const;
-    void setAuthor(const QString &author);
-
-    QString authorId() const;
-    void setAuthorId(const QString &authorId);
+protected:
+    void updateWidgetValue(BarDescriptorDocument::Tag tag, const QVariant &value);
 
 private slots:
     void setAuthorFromDebugToken();
 
=== modified file 'src/qnx/bardescriptoreditorentrypointwidget.cpp'
--- src/qnx/bardescriptoreditorentrypointwidget.cpp	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorentrypointwidget.cpp	2014-06-16 09:46:37 +0000
@@ -57,6 +57,7 @@
     m_ui->setupUi(this);
 
     m_ui->iconFilePath->setExpectedKind(Utils::PathChooser::File);
+    m_ui->iconFilePath->setHistoryCompleter(QLatin1String("Qmake.Icon.History"));
     m_ui->iconFilePath->setPromptDialogFilter(tr("Images (*.jpg *.png)"));
 
     m_ui->iconWarningLabel->setVisible(false);
@@ -65,9 +66,6 @@
     m_ui->splashScreenWarningLabel->setVisible(false);
     m_ui->splashScreenWarningPixmap->setVisible(false);
 
-    connect(m_ui->applicationName, SIGNAL(textChanged(QString)), this, SIGNAL(changed()));
-    connect(m_ui->applicationDescription, SIGNAL(textChanged()), this, SIGNAL(changed()));
-
     connect(m_ui->iconFilePath, SIGNAL(changed(QString)), this, SLOT(handleIconChanged(QString)));
     connect(m_ui->iconClearButton, SIGNAL(clicked()), this, SLOT(clearIcon()));
 
@@ -75,8 +73,14 @@
     m_ui->splashScreensView->setModel(m_splashScreenModel);
     connect(m_ui->addSplashScreen, SIGNAL(clicked()), this, SLOT(browseForSplashScreen()));
     connect(m_ui->removeSplashScreen, SIGNAL(clicked()), this, SLOT(removeSelectedSplashScreen()));
-    connect(m_splashScreenModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SIGNAL(changed()));
     connect(m_ui->splashScreensView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(handleSplashScreenSelectionChanged(QItemSelection,QItemSelection)));
+
+    addSignalMapping(BarDescriptorDocument::name, m_ui->applicationName, SIGNAL(textChanged(QString)));
+    addSignalMapping(BarDescriptorDocument::description, m_ui->applicationDescription, SIGNAL(textChanged()));
+    addSignalMapping(BarDescriptorDocument::icon, m_ui->iconFilePath, SIGNAL(changed(QString)));
+    addSignalMapping(BarDescriptorDocument::splashScreens, m_splashScreenModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)));
+    addSignalMapping(BarDescriptorDocument::splashScreens, m_splashScreenModel, SIGNAL(rowsRemoved(QModelIndex,int,int)));
+    addSignalMapping(BarDescriptorDocument::splashScreens, m_splashScreenModel, SIGNAL(rowsInserted(QModelIndex,int,int)));
 }
 
 BarDescriptorEditorEntryPointWidget::~BarDescriptorEditorEntryPointWidget()
@@ -84,68 +88,40 @@
     delete m_ui;
 }
 
-void BarDescriptorEditorEntryPointWidget::clear()
-{
-    setPathChooserBlocked(m_ui->iconFilePath, QString());
-    setApplicationIconPreview(QString());
-
-    disconnect(m_splashScreenModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SIGNAL(changed()));
-    m_splashScreenModel->setStringList(QStringList());
-    connect(m_splashScreenModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SIGNAL(changed()));
-    setImagePreview(m_ui->splashScreenPreviewLabel, QString());
-}
-
-QString BarDescriptorEditorEntryPointWidget::applicationName() const
-{
-    return m_ui->applicationName->text();
-}
-
-void BarDescriptorEditorEntryPointWidget::setApplicationName(const QString &applicationName)
-{
-    setLineEditBlocked(m_ui->applicationName, applicationName);
-}
-
-QString BarDescriptorEditorEntryPointWidget::applicationDescription() const
-{
-    return m_ui->applicationDescription->toPlainText();
-}
-
-void BarDescriptorEditorEntryPointWidget::setApplicationDescription(const QString &applicationDescription)
-{
-    setTextEditBlocked(m_ui->applicationDescription, applicationDescription);
-}
-
-QString BarDescriptorEditorEntryPointWidget::applicationIconFileName() const
-{
-    return QFileInfo(m_ui->iconFilePath->path()).fileName();
-}
-
-void BarDescriptorEditorEntryPointWidget::setApplicationIcon(const QString &iconPath)
-{
-    // During file loading, the assets might not have been read yet
-    QMetaObject::invokeMethod(this, "setApplicationIconDelayed", Qt::QueuedConnection, Q_ARG(QString, iconPath));
-}
-
-QStringList BarDescriptorEditorEntryPointWidget::splashScreens() const
-{
-    QStringList result;
-
-    foreach (const QString &splashScreen, m_splashScreenModel->stringList())
-        result << QFileInfo(splashScreen).fileName();
-
-    return result;
-}
-
-void BarDescriptorEditorEntryPointWidget::appendSplashScreen(const QString &splashScreenPath)
-{
-    QMetaObject::invokeMethod(this, "appendSplashScreenDelayed", Qt::QueuedConnection, Q_ARG(QString, splashScreenPath));
-}
-
 void BarDescriptorEditorEntryPointWidget::setAssetsModel(QStandardItemModel *assetsModel)
 {
     m_assetsModel = QWeakPointer<QStandardItemModel>(assetsModel);
 }
 
+void BarDescriptorEditorEntryPointWidget::updateWidgetValue(BarDescriptorDocument::Tag tag, const QVariant &value)
+{
+    // During file loading, the assets might not have been read yet
+    if (tag == BarDescriptorDocument::icon) {
+        QMetaObject::invokeMethod(this, "setApplicationIconDelayed", Qt::QueuedConnection, Q_ARG(QString, value.toString()));
+    } else if (tag == BarDescriptorDocument::splashScreens) {
+        QStringList splashScreens = value.toStringList();
+        foreach (const QString &splashScreen, splashScreens)
+            QMetaObject::invokeMethod(this, "appendSplashScreenDelayed", Qt::QueuedConnection, Q_ARG(QString, splashScreen));
+    } else {
+        BarDescriptorEditorAbstractPanelWidget::updateWidgetValue(tag, value);
+    }
+}
+
+void BarDescriptorEditorEntryPointWidget::emitChanged(BarDescriptorDocument::Tag tag)
+{
+    if (tag == BarDescriptorDocument::icon) {
+        emit changed(tag, QFileInfo(m_ui->iconFilePath->path()).fileName());
+    } else if (tag == BarDescriptorDocument::splashScreens) {
+        QStringList list;
+        foreach (const QString &splashScreen, m_splashScreenModel->stringList())
+            list << QFileInfo(splashScreen).fileName();
+
+        emit changed(tag, list);
+    } else {
+        BarDescriptorEditorAbstractPanelWidget::emitChanged(tag);
+    }
+}
+
 void BarDescriptorEditorEntryPointWidget::setApplicationIconPreview(const QString &path)
 {
     setImagePreview(m_ui->iconPreviewLabel, path);
@@ -164,8 +140,8 @@
     setApplicationIconPreview(path);
     validateIconSize(path);
 
-    emit changed();
-    emit imageRemoved(m_prevIconPath);
+    if (!m_splashScreenModel->stringList().contains(m_prevIconPath))
+        emit imageRemoved(m_prevIconPath);
 
     m_prevIconPath = path;
     if (QFileInfo(path).exists())
@@ -200,7 +176,8 @@
 
     foreach (const QModelIndex &index, selectedIndexes) {
         QString path = m_splashScreenModel->data(index, Qt::DisplayRole).toString();
-        emit imageRemoved(path);
+        if (path != m_ui->iconFilePath->path())
+            emit imageRemoved(path);
 
         m_splashScreenModel->removeRow(index.row());
     }
@@ -230,11 +207,11 @@
     if (fullSplashScreenPath.isEmpty())
         return;
 
-    disconnect(m_splashScreenModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SIGNAL(changed()));
+    blockSignalMapping(BarDescriptorDocument::splashScreens);
     int rowCount = m_splashScreenModel->rowCount();
     m_splashScreenModel->insertRow(rowCount);
     m_splashScreenModel->setData(m_splashScreenModel->index(rowCount), fullSplashScreenPath);
-    connect(m_splashScreenModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SIGNAL(changed()));
+    unblockSignalMapping(BarDescriptorDocument::splashScreens);
 }
 
 void BarDescriptorEditorEntryPointWidget::setImagePreview(QLabel *previewLabel, const QString &path)
@@ -309,9 +286,11 @@
     if (fullIconPath.isEmpty())
         return;
 
-    setPathChooserBlocked(m_ui->iconFilePath, fullIconPath);
+    blockSignalMapping(BarDescriptorDocument::icon);
+    m_ui->iconFilePath->setPath(fullIconPath);
     setApplicationIconPreview(fullIconPath);
     validateIconSize(fullIconPath);
+    unblockSignalMapping(BarDescriptorDocument::icon);
 }
 
 QString BarDescriptorEditorEntryPointWidget::localAssetPathFromDestination(const QString &destination)
 
=== modified file 'src/qnx/bardescriptoreditorentrypointwidget.h'
--- src/qnx/bardescriptoreditorentrypointwidget.h	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorentrypointwidget.h	2014-06-16 09:46:37 +0000
@@ -45,9 +45,7 @@
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BarDescriptorEditorEntryPointWidget;
-}
+namespace Ui { class BarDescriptorEditorEntryPointWidget; }
 
 class BarDescriptorEditorEntryPointWidget : public BarDescriptorEditorAbstractPanelWidget
 {
@@ -57,26 +55,16 @@
     explicit BarDescriptorEditorEntryPointWidget(QWidget *parent = 0);
     ~BarDescriptorEditorEntryPointWidget();
 
-    void clear();
-
-    QString applicationName() const;
-    void setApplicationName(const QString &applicationName);
-
-    QString applicationDescription() const;
-    void setApplicationDescription(const QString &applicationDescription);
-
-    QString applicationIconFileName() const;
-    void setApplicationIcon(const QString &iconPath);
-
-    QStringList splashScreens() const;
-    void appendSplashScreen(const QString &splashScreenPath);
-
     void setAssetsModel(QStandardItemModel *assetsModel);
 
 signals:
     void imageAdded(const QString &path);
     void imageRemoved(const QString &path);
 
+protected:
+    void updateWidgetValue(BarDescriptorDocument::Tag tag, const QVariant &value);
+    void emitChanged(BarDescriptorDocument::Tag tag);
+
 private slots:
     void setApplicationIconDelayed(const QString &iconPath);
     void setApplicationIconPreview(const QString &path);
 
=== modified file 'src/qnx/bardescriptoreditorenvironmentwidget.cpp'
--- src/qnx/bardescriptoreditorenvironmentwidget.cpp	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorenvironmentwidget.cpp	2014-06-16 09:46:37 +0000
@@ -43,7 +43,7 @@
 
     m_ui->environmentWidget->setBaseEnvironmentText(tr("Device Environment"));
 
-    connect(m_ui->environmentWidget, SIGNAL(userChangesChanged()), this, SIGNAL(changed()));
+    addSignalMapping(BarDescriptorDocument::env, m_ui->environmentWidget, SIGNAL(userChangesChanged()));
 }
 
 BarDescriptorEditorEnvironmentWidget::~BarDescriptorEditorEnvironmentWidget()
@@ -51,23 +51,24 @@
     delete m_ui;
 }
 
-void BarDescriptorEditorEnvironmentWidget::clear()
-{
-    disconnect(m_ui->environmentWidget, SIGNAL(userChangesChanged()), this, SIGNAL(changed()));
-    m_ui->environmentWidget->setUserChanges(QList<Utils::EnvironmentItem>());
-    connect(m_ui->environmentWidget, SIGNAL(userChangesChanged()), this, SIGNAL(changed()));
-}
-
-QList<Utils::EnvironmentItem> BarDescriptorEditorEnvironmentWidget::environment() const
-{
-    return m_ui->environmentWidget->userChanges();
-}
-
-void BarDescriptorEditorEnvironmentWidget::appendEnvironmentItem(const Utils::EnvironmentItem &envItem)
-{
-    disconnect(m_ui->environmentWidget, SIGNAL(userChangesChanged()), this, SIGNAL(changed()));
-    QList<Utils::EnvironmentItem> items = m_ui->environmentWidget->userChanges();
-    items.append(envItem);
-    m_ui->environmentWidget->setUserChanges(items);
-    connect(m_ui->environmentWidget, SIGNAL(userChangesChanged()), this, SIGNAL(changed()));
+void BarDescriptorEditorEnvironmentWidget::updateWidgetValue(BarDescriptorDocument::Tag tag, const QVariant &value)
+{
+    if (tag != BarDescriptorDocument::env) {
+        BarDescriptorEditorAbstractPanelWidget::updateWidgetValue(tag, value);
+        return;
+    }
+
+    m_ui->environmentWidget->setUserChanges(value.value<QList<Utils::EnvironmentItem> >());
+}
+
+void BarDescriptorEditorEnvironmentWidget::emitChanged(BarDescriptorDocument::Tag tag)
+{
+    if (tag != BarDescriptorDocument::env) {
+        BarDescriptorEditorAbstractPanelWidget::emitChanged(tag);
+        return;
+    }
+
+    QVariant var;
+    var.setValue(m_ui->environmentWidget->userChanges());
+    emit changed(tag, var);
 }
 
=== modified file 'src/qnx/bardescriptoreditorenvironmentwidget.h'
--- src/qnx/bardescriptoreditorenvironmentwidget.h	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorenvironmentwidget.h	2014-06-16 09:46:37 +0000
@@ -39,9 +39,7 @@
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BarDescriptorEditorEnvironmentWidget;
-}
+namespace Ui { class BarDescriptorEditorEnvironmentWidget; }
 
 class BarDescriptorEditorEnvironmentWidget : public BarDescriptorEditorAbstractPanelWidget
 {
@@ -51,10 +49,9 @@
     explicit BarDescriptorEditorEnvironmentWidget(QWidget *parent = 0);
     ~BarDescriptorEditorEnvironmentWidget();
 
-    void clear();
-
-    QList<Utils::EnvironmentItem> environment() const;
-    void appendEnvironmentItem(const Utils::EnvironmentItem &envItem);
+protected:
+    void updateWidgetValue(BarDescriptorDocument::Tag tag, const QVariant &value);
+    void emitChanged(BarDescriptorDocument::Tag tag);
 
 private:
     Ui::BarDescriptorEditorEnvironmentWidget *m_ui;
 
=== modified file 'src/qnx/bardescriptoreditorfactory.cpp'
--- src/qnx/bardescriptoreditorfactory.cpp	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorfactory.cpp	2014-06-16 09:46:37 +0000
@@ -32,6 +32,7 @@
 #include "bardescriptoreditorfactory.h"
 
 #include "qnxconstants.h"
+#include "bardescriptoreditor.h"
 #include "bardescriptoreditorwidget.h"
 
 #include <coreplugin/editormanager/editormanager.h>
@@ -44,8 +45,8 @@
 class BarDescriptorActionHandler : public TextEditor::TextEditorActionHandler
 {
 public:
-    BarDescriptorActionHandler()
-        : TextEditor::TextEditorActionHandler(Constants::QNX_BAR_DESCRIPTOR_EDITOR_CONTEXT)
+    BarDescriptorActionHandler(QObject *parent)
+        : TextEditor::TextEditorActionHandler(parent, Constants::QNX_BAR_DESCRIPTOR_EDITOR_CONTEXT)
     {
     }
 protected:
@@ -58,20 +59,15 @@
 
 BarDescriptorEditorFactory::BarDescriptorEditorFactory(QObject *parent)
     : Core::IEditorFactory(parent)
-    , m_actionHandler(new BarDescriptorActionHandler)
 {
     setId(Constants::QNX_BAR_DESCRIPTOR_EDITOR_ID);
     setDisplayName(tr("Bar descriptor editor"));
     addMimeType(Constants::QNX_BAR_DESCRIPTOR_MIME_TYPE);
-}
-
-BarDescriptorEditorFactory::~BarDescriptorEditorFactory()
-{
-    delete m_actionHandler;
-}
-
-Core::IEditor *BarDescriptorEditorFactory::createEditor(QWidget *parent)
-{
-    BarDescriptorEditorWidget *editorWidget = new BarDescriptorEditorWidget(parent, m_actionHandler);
-    return editorWidget->editor();
+    new BarDescriptorActionHandler(this);
+}
+
+Core::IEditor *BarDescriptorEditorFactory::createEditor()
+{
+    BarDescriptorEditor *editor = new BarDescriptorEditor();
+    return editor;
 }
 
=== modified file 'src/qnx/bardescriptoreditorfactory.h'
--- src/qnx/bardescriptoreditorfactory.h	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorfactory.h	2014-06-16 09:46:37 +0000
@@ -34,10 +34,6 @@
 
 #include <coreplugin/editormanager/ieditorfactory.h>
 
-namespace TextEditor {
-class TextEditorActionHandler;
-}
-
 namespace Qnx {
 namespace Internal {
 
@@ -47,12 +43,8 @@
 
 public:
     explicit BarDescriptorEditorFactory(QObject *parent = 0);
-    ~BarDescriptorEditorFactory();
-
-    Core::IEditor *createEditor(QWidget *parent);
-
-private:
-    TextEditor::TextEditorActionHandler *m_actionHandler;
+
+    Core::IEditor *createEditor();
 };
 
 } // namespace Internal
 
=== modified file 'src/qnx/bardescriptoreditorgeneralwidget.cpp'
--- src/qnx/bardescriptoreditorgeneralwidget.cpp	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorgeneralwidget.cpp	2014-06-16 09:46:37 +0000
@@ -51,10 +51,10 @@
     m_ui->chrome->addItem(tr("Standard"), QLatin1String("standard"));
     m_ui->chrome->addItem(tr("None"), QLatin1String("none"));
 
-    connect(m_ui->orientation, SIGNAL(currentIndexChanged(int)), this, SIGNAL(changed()));
-    connect(m_ui->chrome, SIGNAL(currentIndexChanged(int)), this, SIGNAL(changed()));
-    connect(m_ui->transparentMainWindow, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_ui->applicationArguments, SIGNAL(textChanged(QString)), this, SIGNAL(changed()));
+    addSignalMapping(BarDescriptorDocument::aspectRatio, m_ui->orientation, SIGNAL(currentIndexChanged(int)));
+    addSignalMapping(BarDescriptorDocument::systemChrome, m_ui->chrome, SIGNAL(currentIndexChanged(int)));
+    addSignalMapping(BarDescriptorDocument::transparent, m_ui->transparentMainWindow, SIGNAL(toggled(bool)));
+    addSignalMapping(BarDescriptorDocument::arg, m_ui->applicationArguments, SIGNAL(textChanged(QString)));
 }
 
 BarDescriptorEditorGeneralWidget::~BarDescriptorEditorGeneralWidget()
@@ -62,62 +62,41 @@
     delete m_ui;
 }
 
-void BarDescriptorEditorGeneralWidget::clear()
-{
-    setComboBoxBlocked(m_ui->orientation, m_ui->orientation->findData(QLatin1String("")));
-    setComboBoxBlocked(m_ui->chrome, m_ui->chrome->findData(QLatin1String("none")));
-    setCheckBoxBlocked(m_ui->transparentMainWindow, false);
-    setLineEditBlocked(m_ui->applicationArguments, QString());
-}
-
-QString BarDescriptorEditorGeneralWidget::orientation() const
-{
-    return m_ui->orientation->itemData(m_ui->orientation->currentIndex()).toString();
-}
-
-void BarDescriptorEditorGeneralWidget::setOrientation(const QString &orientation)
-{
-    int index = m_ui->orientation->findData(orientation);
-    QTC_ASSERT(index >= 0, return);
-
-    setComboBoxBlocked(m_ui->orientation, index);
-}
-
-QString BarDescriptorEditorGeneralWidget::chrome() const
-{
-    return m_ui->chrome->itemData(m_ui->chrome->currentIndex()).toString();
-}
-
-void BarDescriptorEditorGeneralWidget::setChrome(const QString &chrome)
-{
-    int index = m_ui->chrome->findData(chrome);
-    QTC_ASSERT(index >= 0, return);
-
-    setComboBoxBlocked(m_ui->chrome, index);
-}
-
-bool BarDescriptorEditorGeneralWidget::transparent() const
-{
-    return m_ui->transparentMainWindow->isChecked();
-}
-
-void BarDescriptorEditorGeneralWidget::setTransparent(bool transparent)
-{
-    setCheckBoxBlocked(m_ui->transparentMainWindow, transparent);
-}
-
-void BarDescriptorEditorGeneralWidget::appendApplicationArgument(const QString &argument)
-{
-    QString completeArguments = m_ui->applicationArguments->text();
-    if (!completeArguments.isEmpty())
-        completeArguments.append(QLatin1Char(' '));
-    completeArguments.append(argument);
-
-    setLineEditBlocked(m_ui->applicationArguments, completeArguments);
-}
-
-QStringList BarDescriptorEditorGeneralWidget::applicationArguments() const
-{
-    // TODO: Should probably handle "argument with spaces within quotes"
-    return m_ui->applicationArguments->text().split(QLatin1Char(' '));
+void BarDescriptorEditorGeneralWidget::updateWidgetValue(BarDescriptorDocument::Tag tag, const QVariant &value)
+{
+    if (tag == BarDescriptorDocument::aspectRatio) {
+        m_ui->orientation->setCurrentIndex(m_ui->orientation->findData(value));
+    } else if (tag == BarDescriptorDocument::autoOrients) {
+        if (value.toString() == QLatin1String("true")) {
+            blockSignalMapping(BarDescriptorDocument::aspectRatio);
+            m_ui->orientation->setCurrentIndex(m_ui->orientation->findData(QLatin1String("auto-orient")));
+            unblockSignalMapping(BarDescriptorDocument::aspectRatio);
+        }
+    } else if (tag == BarDescriptorDocument::arg) {
+        m_ui->applicationArguments->setText(value.toStringList().join(QLatin1String(" ")));
+    } else {
+        BarDescriptorEditorAbstractPanelWidget::updateWidgetValue(tag, value);
+    }
+}
+
+void BarDescriptorEditorGeneralWidget::emitChanged(BarDescriptorDocument::Tag tag)
+{
+    if (tag == BarDescriptorDocument::aspectRatio) {
+        QString value = m_ui->orientation->itemData(m_ui->orientation->currentIndex()).toString();
+        if (value == QLatin1String("auto-orient")) {
+            emit changed(BarDescriptorDocument::aspectRatio, QLatin1String(""));
+            emit changed(BarDescriptorDocument::autoOrients, QLatin1String("true"));
+            return;
+        } else if (!value.isEmpty()) {
+            emit changed(BarDescriptorDocument::aspectRatio, value);
+            emit changed(BarDescriptorDocument::autoOrients, QLatin1String("false"));
+        } else {
+            emit changed(BarDescriptorDocument::aspectRatio, value);
+            emit changed(BarDescriptorDocument::autoOrients, QLatin1String(""));
+        }
+    } else if (tag == BarDescriptorDocument::arg) {
+        emit changed(tag, m_ui->applicationArguments->text().split(QLatin1Char(' ')));
+    } else {
+        BarDescriptorEditorAbstractPanelWidget::emitChanged(tag);
+    }
 }
 
=== modified file 'src/qnx/bardescriptoreditorgeneralwidget.h'
--- src/qnx/bardescriptoreditorgeneralwidget.h	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorgeneralwidget.h	2014-06-16 09:46:37 +0000
@@ -37,9 +37,7 @@
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BarDescriptorEditorGeneralWidget;
-}
+namespace Ui { class BarDescriptorEditorGeneralWidget; }
 
 class BarDescriptorEditorGeneralWidget : public BarDescriptorEditorAbstractPanelWidget
 {
@@ -49,19 +47,9 @@
     explicit BarDescriptorEditorGeneralWidget(QWidget *parent = 0);
     ~BarDescriptorEditorGeneralWidget();
 
-    void clear();
-
-    QString orientation() const;
-    void setOrientation(const QString &orientation);
-
-    QString chrome() const;
-    void setChrome(const QString &chrome);
-
-    bool transparent() const;
-    void setTransparent(bool transparent);
-
-    void appendApplicationArgument(const QString &argument);
-    QStringList applicationArguments() const;
+protected:
+    void updateWidgetValue(BarDescriptorDocument::Tag tag, const QVariant &value);
+    void emitChanged(BarDescriptorDocument::Tag tag);
 
 private:
     Ui::BarDescriptorEditorGeneralWidget *m_ui;
 
=== modified file 'src/qnx/bardescriptoreditorpackageinformationwidget.cpp'
--- src/qnx/bardescriptoreditorpackageinformationwidget.cpp	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorpackageinformationwidget.cpp	2014-06-16 09:46:37 +0000
@@ -45,55 +45,12 @@
     QRegExpValidator *versionNumberValidator = new QRegExpValidator(versionNumberRegExp, this);
     m_ui->packageVersion->setValidator(versionNumberValidator);
 
-    connect(m_ui->packageId, SIGNAL(textChanged(QString)), this, SIGNAL(changed()));
-    connect(m_ui->packageVersion, SIGNAL(textChanged(QString)), this, SIGNAL(changed()));
-    connect(m_ui->packageBuildId, SIGNAL(textChanged(QString)), this, SIGNAL(changed()));
+    addSignalMapping(BarDescriptorDocument::id, m_ui->packageId, SIGNAL(textChanged(QString)));
+    addSignalMapping(BarDescriptorDocument::versionNumber, m_ui->packageVersion, SIGNAL(textChanged(QString)));
+    addSignalMapping(BarDescriptorDocument::buildId, m_ui->packageBuildId, SIGNAL(textChanged(QString)));
 }
 
 BarDescriptorEditorPackageInformationWidget::~BarDescriptorEditorPackageInformationWidget()
 {
     delete m_ui;
 }
-
-void BarDescriptorEditorPackageInformationWidget::clear()
-{
-    setLineEditBlocked(m_ui->packageId, QString());
-    setLineEditBlocked(m_ui->packageVersion, QString());
-    setLineEditBlocked(m_ui->packageBuildId, QString());
-}
-
-QString BarDescriptorEditorPackageInformationWidget::packageId() const
-{
-    return m_ui->packageId->text();
-}
-
-void BarDescriptorEditorPackageInformationWidget::setPackageId(const QString &packageId)
-{
-    setLineEditBlocked(m_ui->packageId, packageId);
-}
-
-QString BarDescriptorEditorPackageInformationWidget::packageVersion() const
-{
-    QString version = m_ui->packageVersion->text();
-    int pos = 0;
-    if (m_ui->packageVersion->validator()->validate(version, pos) == QValidator::Intermediate) {
-        if (version.endsWith(QLatin1Char('.')))
-            version = version.left(version.size() - 1);
-    }
-    return version;
-}
-
-void BarDescriptorEditorPackageInformationWidget::setPackageVersion(const QString &packageVersion)
-{
-    setLineEditBlocked(m_ui->packageVersion, packageVersion);
-}
-
-QString BarDescriptorEditorPackageInformationWidget::packageBuildId() const
-{
-    return m_ui->packageBuildId->text();
-}
-
-void BarDescriptorEditorPackageInformationWidget::setPackageBuildId(const QString &packageBuildId)
-{
-    setLineEditBlocked(m_ui->packageBuildId, packageBuildId);
-}
 
=== modified file 'src/qnx/bardescriptoreditorpackageinformationwidget.h'
--- src/qnx/bardescriptoreditorpackageinformationwidget.h	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorpackageinformationwidget.h	2014-06-16 09:46:37 +0000
@@ -37,9 +37,7 @@
 namespace Qnx {
 namespace Internal {
 
-namespace Ui {
-class BarDescriptorEditorPackageInformationWidget;
-}
+namespace Ui { class BarDescriptorEditorPackageInformationWidget; }
 
 class BarDescriptorEditorPackageInformationWidget : public BarDescriptorEditorAbstractPanelWidget
 {
@@ -49,17 +47,6 @@
     explicit BarDescriptorEditorPackageInformationWidget(QWidget *parent = 0);
     ~BarDescriptorEditorPackageInformationWidget();
 
-    void clear();
-
-    QString packageId() const;
-    void setPackageId(const QString &packageId);
-
-    QString packageVersion() const;
-    void setPackageVersion(const QString &packageVersion);
-
-    QString packageBuildId() const;
-    void setPackageBuildId(const QString &packageBuildId);
-
 private:
     Ui::BarDescriptorEditorPackageInformationWidget *m_ui;
 };
 
=== modified file 'src/qnx/bardescriptoreditorpermissionswidget.cpp'
--- src/qnx/bardescriptoreditorpermissionswidget.cpp	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorpermissionswidget.cpp	2014-06-16 09:46:37 +0000
@@ -48,7 +48,8 @@
 
     connect(m_ui->selectAllPermissions, SIGNAL(clicked()), m_permissionsModel, SLOT(checkAll()));
     connect(m_ui->deselectAllPermissions, SIGNAL(clicked()), m_permissionsModel, SLOT(uncheckAll()));
-    connect(m_permissionsModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SIGNAL(changed()));
+
+    addSignalMapping(BarDescriptorDocument::action, m_permissionsModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)));
 }
 
 BarDescriptorEditorPermissionsWidget::~BarDescriptorEditorPermissionsWidget()
@@ -56,13 +57,6 @@
     delete m_ui;
 }
 
-void BarDescriptorEditorPermissionsWidget::clear()
-{
-    disconnect(m_permissionsModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SIGNAL(changed()));
-    m_permissionsModel->uncheckAll();
-    connect(m_permissionsModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SIGNAL(changed()));
-}
-
 QStringList BarDescriptorEditorPermissionsWidget::checkedPermissions() const
 {
     return m_permissionsModel->checkedIdentifiers();
@@ -70,7 +64,29 @@
 
 void BarDescriptorEditorPermissionsWidget::checkPermission(const QString &identifier)
 {
-    disconnect(m_permissionsModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SIGNAL(changed()));
+    blockSignalMapping(BarDescriptorDocument::action);
     m_permissionsModel->checkPermission(identifier);
-    connect(m_permissionsModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SIGNAL(changed()));
+    unblockSignalMapping(BarDescriptorDocument::action);
+}
+
+void BarDescriptorEditorPermissionsWidget::updateWidgetValue(BarDescriptorDocument::Tag tag, const QVariant &value)
+{
+    if (tag != BarDescriptorDocument::action) {
+        BarDescriptorEditorAbstractPanelWidget::updateWidgetValue(tag, value);
+        return;
+    }
+
+    QStringList permissions = value.toStringList();
+    Q_FOREACH (const QString &permission, permissions)
+        checkPermission(permission);
+}
+
+void BarDescriptorEditorPermissionsWidget::emitChanged(BarDescriptorDocument::Tag tag)
+{
+    if (tag != BarDescriptorDocument::action) {
+        BarDescriptorEditorAbstractPanelWidget::emitChanged(tag);
+        return;
+    }
+
+    emit changed(tag, checkedPermissions());
 }
 
=== modified file 'src/qnx/bardescriptoreditorpermissionswidget.h'
--- src/qnx/bardescriptoreditorpermissionswidget.h	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorpermissionswidget.h	2014-06-16 09:46:37 +0000
@@ -39,9 +39,7 @@
 
 class BarDescriptorPermissionsModel;
 
-namespace Ui {
-class BarDescriptorEditorPermissionsWidget;
-}
+namespace Ui { class BarDescriptorEditorPermissionsWidget; }
 
 class BarDescriptorEditorPermissionsWidget : public BarDescriptorEditorAbstractPanelWidget
 {
@@ -51,12 +49,14 @@
     explicit BarDescriptorEditorPermissionsWidget(QWidget *parent = 0);
     ~BarDescriptorEditorPermissionsWidget();
 
-    void clear();
+protected:
+    void updateWidgetValue(BarDescriptorDocument::Tag tag, const QVariant &value);
+    void emitChanged(BarDescriptorDocument::Tag tag);
 
+private:
     QStringList checkedPermissions() const;
     void checkPermission(const QString &identifier);
 
-private:
     Ui::BarDescriptorEditorPermissionsWidget *m_ui;
 
     BarDescriptorPermissionsModel *m_permissionsModel;
 
=== modified file 'src/qnx/bardescriptoreditorwidget.cpp'
--- src/qnx/bardescriptoreditorwidget.cpp	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorwidget.cpp	2014-06-16 09:46:37 +0000
@@ -44,20 +44,19 @@
 #include <coreplugin/icore.h>
 #include <projectexplorer/iprojectproperties.h>
 #include <projectexplorer/projectwindow.h>
+#include <projectexplorer/task.h>
+#include <projectexplorer/taskhub.h>
 #include <texteditor/plaintexteditor.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/texteditorconstants.h>
+#include <utils/qtcassert.h>
 
 using namespace Qnx;
 using namespace Qnx::Internal;
 
-BarDescriptorEditorWidget::BarDescriptorEditorWidget(
-        QWidget *parent, TextEditor::TextEditorActionHandler *handler)
+BarDescriptorEditorWidget::BarDescriptorEditorWidget(BarDescriptorEditor *editor, QWidget *parent)
     : QStackedWidget(parent)
-    , m_editor(0)
-    , m_handler(handler)
-    , m_dirty(false)
+    , m_editor(editor)
 {
     Core::IContext *myContext = new Core::IContext(this);
     myContext->setWidget(this);
@@ -70,6 +69,25 @@
     initSourcePage();
 
     setCurrentIndex(0);
+
+    connect(m_entryPointWidget,         SIGNAL(changed(BarDescriptorDocument::Tag,QVariant)), barDescriptorDocument(), SLOT(setValue(BarDescriptorDocument::Tag,QVariant)));
+    connect(m_packageInformationWidget, SIGNAL(changed(BarDescriptorDocument::Tag,QVariant)), barDescriptorDocument(), SLOT(setValue(BarDescriptorDocument::Tag,QVariant)));
+    connect(m_authorInformationWidget,  SIGNAL(changed(BarDescriptorDocument::Tag,QVariant)), barDescriptorDocument(), SLOT(setValue(BarDescriptorDocument::Tag,QVariant)));
+    connect(m_generalWidget,            SIGNAL(changed(BarDescriptorDocument::Tag,QVariant)), barDescriptorDocument(), SLOT(setValue(BarDescriptorDocument::Tag,QVariant)));
+    connect(m_permissionsWidget,        SIGNAL(changed(BarDescriptorDocument::Tag,QVariant)), barDescriptorDocument(), SLOT(setValue(BarDescriptorDocument::Tag,QVariant)));
+    connect(m_environmentWidget,        SIGNAL(changed(BarDescriptorDocument::Tag,QVariant)), barDescriptorDocument(), SLOT(setValue(BarDescriptorDocument::Tag,QVariant)));
+    connect(m_assetsWidget,             SIGNAL(changed(BarDescriptorDocument::Tag,QVariant)), barDescriptorDocument(), SLOT(setValue(BarDescriptorDocument::Tag,QVariant)));
+
+    connect(barDescriptorDocument(), SIGNAL(changed(BarDescriptorDocument::Tag,QVariant)), m_entryPointWidget,         SLOT(setValue(BarDescriptorDocument::Tag,QVariant)));
+    connect(barDescriptorDocument(), SIGNAL(changed(BarDescriptorDocument::Tag,QVariant)), m_packageInformationWidget, SLOT(setValue(BarDescriptorDocument::Tag,QVariant)));
+    connect(barDescriptorDocument(), SIGNAL(changed(BarDescriptorDocument::Tag,QVariant)), m_authorInformationWidget,  SLOT(setValue(BarDescriptorDocument::Tag,QVariant)));
+    connect(barDescriptorDocument(), SIGNAL(changed(BarDescriptorDocument::Tag,QVariant)), m_generalWidget,            SLOT(setValue(BarDescriptorDocument::Tag,QVariant)));
+    connect(barDescriptorDocument(), SIGNAL(changed(BarDescriptorDocument::Tag,QVariant)), m_permissionsWidget,        SLOT(setValue(BarDescriptorDocument::Tag,QVariant)));
+    connect(barDescriptorDocument(), SIGNAL(changed(BarDescriptorDocument::Tag,QVariant)), m_environmentWidget,        SLOT(setValue(BarDescriptorDocument::Tag,QVariant)));
+    connect(barDescriptorDocument(), SIGNAL(changed(BarDescriptorDocument::Tag,QVariant)), m_assetsWidget,             SLOT(setValue(BarDescriptorDocument::Tag,QVariant)));
+
+    connect(m_xmlSourceWidget, SIGNAL(textChanged()), this, SLOT(updateDocumentContent()));
+    connect(barDescriptorDocument(), SIGNAL(changed()), this, SLOT(updateSourceView()));
 }
 
 void BarDescriptorEditorWidget::initGeneralPage()
@@ -98,10 +116,6 @@
     authorInformationPanel->setDisplayName(tr("Author Information"));
     authorInformationPanel->setWidget(m_authorInformationWidget);
     generalPanel->addPropertiesPanel(authorInformationPanel);
-
-    connect(m_entryPointWidget, SIGNAL(changed()), this, SLOT(setDirty()));
-    connect(m_packageInformationWidget, SIGNAL(changed()), this, SLOT(setDirty()));
-    connect(m_authorInformationWidget, SIGNAL(changed()), this, SLOT(setDirty()));
 }
 
 void BarDescriptorEditorWidget::initApplicationPage()
@@ -130,10 +144,6 @@
     environmentPanel->setDisplayName(tr("Environment"));
     environmentPanel->setWidget(m_environmentWidget);
     applicationPanel->addPropertiesPanel(environmentPanel);
-
-    connect(m_generalWidget, SIGNAL(changed()), this, SLOT(setDirty()));
-    connect(m_permissionsWidget, SIGNAL(changed()), this, SLOT(setDirty()));
-    connect(m_environmentWidget, SIGNAL(changed()), this, SLOT(setDirty()));
 }
 
 void BarDescriptorEditorWidget::initAssetsPage()
@@ -148,8 +158,6 @@
     assetsPropertiesPanel->setWidget(m_assetsWidget);
     assetsPanel->addPropertiesPanel(assetsPropertiesPanel);
 
-    connect(m_assetsWidget, SIGNAL(changed()), this, SLOT(setDirty()));
-
     m_entryPointWidget->setAssetsModel(m_assetsWidget->assetsModel());
     connect(m_entryPointWidget, SIGNAL(imageAdded(QString)), m_assetsWidget, SLOT(addAsset(QString)));
     connect(m_entryPointWidget, SIGNAL(imageRemoved(QString)), m_assetsWidget, SLOT(removeAsset(QString)));
@@ -161,9 +169,7 @@
     addWidget(m_xmlSourceWidget);
 
     TextEditor::TextEditorSettings::initializeEditor(m_xmlSourceWidget);
-    m_handler->setupActions(m_xmlSourceWidget);
     m_xmlSourceWidget->configure(QLatin1String(Constants::QNX_BAR_DESCRIPTOR_MIME_TYPE));
-    connect(m_xmlSourceWidget, SIGNAL(textChanged()), this, SLOT(setDirty()));
 }
 
 void BarDescriptorEditorWidget::initPanelSize(ProjectExplorer::PanelsWidget *panelsWidget)
@@ -172,51 +178,6 @@
     panelsWidget->widget()->setMinimumWidth(0);
 }
 
-Core::IEditor *BarDescriptorEditorWidget::editor() const
-{
-    if (!m_editor) {
-        m_editor = const_cast<BarDescriptorEditorWidget *>(this)->createEditor();
-        connect(this, SIGNAL(changed()), m_editor->document(), SIGNAL(changed()));
-    }
-
-    return m_editor;
-}
-
-BarDescriptorEditorPackageInformationWidget *BarDescriptorEditorWidget::packageInformationWidget() const
-{
-    return m_packageInformationWidget;
-}
-
-BarDescriptorEditorAuthorInformationWidget *BarDescriptorEditorWidget::authorInformationWidget() const
-{
-    return m_authorInformationWidget;
-}
-
-BarDescriptorEditorEntryPointWidget *BarDescriptorEditorWidget::entryPointWidget() const
-{
-    return m_entryPointWidget;
-}
-
-BarDescriptorEditorGeneralWidget *BarDescriptorEditorWidget::generalWidget() const
-{
-    return m_generalWidget;
-}
-
-BarDescriptorEditorPermissionsWidget *BarDescriptorEditorWidget::permissionsWidget() const
-{
-    return m_permissionsWidget;
-}
-
-BarDescriptorEditorEnvironmentWidget *BarDescriptorEditorWidget::environmentWidget() const
-{
-    return m_environmentWidget;
-}
-
-BarDescriptorEditorAssetsWidget *BarDescriptorEditorWidget::assetsWidget() const
-{
-    return m_assetsWidget;
-}
-
 TextEditor::BaseTextEditorWidget *BarDescriptorEditorWidget::sourceWidget() const
 {
     return m_xmlSourceWidget;
@@ -224,57 +185,45 @@
 
 void BarDescriptorEditorWidget::setFilePath(const QString &filePath)
 {
-    Core::IDocument *doc = m_xmlSourceWidget->editorDocument();
-    if (doc) {
+    Core::IDocument *doc = m_xmlSourceWidget->baseTextDocument();
+    if (doc)
         doc->setFilePath(filePath);
-        // setFilePath() call leads to a textChanged() signal emitted
-        // and therefore having this editor-widget to become dirty
-        // therefore we have to explicitly unset the dirty flag
-        setDirty(false);
+}
+
+void BarDescriptorEditorWidget::updateDocumentContent()
+{
+    ProjectExplorer::TaskHub::clearTasks(Constants::QNX_TASK_CATEGORY_BARDESCRIPTOR);
+    QString errorMsg;
+    int errorLine;
+
+    disconnect(barDescriptorDocument(), SIGNAL(changed()), this, SLOT(updateSourceView()));
+    bool result = barDescriptorDocument()->loadContent(m_xmlSourceWidget->toPlainText(), true, &errorMsg, &errorLine);
+    connect(barDescriptorDocument(), SIGNAL(changed()), this, SLOT(updateSourceView()));
+
+    if (!result) {
+        ProjectExplorer::TaskHub::addTask(ProjectExplorer::Task::Error, errorMsg, Constants::QNX_TASK_CATEGORY_BARDESCRIPTOR,
+                                          Utils::FileName::fromString(barDescriptorDocument()->filePath()), errorLine);
+        ProjectExplorer::TaskHub::requestPopup();
     }
 }
 
-QString BarDescriptorEditorWidget::xmlSource() const
-{
-    return m_xmlSourceWidget->toPlainText();
-}
-
-void BarDescriptorEditorWidget::setXmlSource(const QString &xmlSource)
-{
-    bool blocked = m_xmlSourceWidget->blockSignals(true);
-    m_xmlSourceWidget->setPlainText(xmlSource);
-    m_xmlSourceWidget->blockSignals(blocked);
-}
-
-bool BarDescriptorEditorWidget::isDirty() const
-{
-    return m_dirty;
-}
-
-void BarDescriptorEditorWidget::clear()
-{
-    m_entryPointWidget->clear();
-    m_packageInformationWidget->clear();
-    m_authorInformationWidget->clear();
-
-    m_generalWidget->clear();
-    m_permissionsWidget->clear();
-    m_environmentWidget->clear();
-
-    m_assetsWidget->clear();
-
-    bool blocked = m_xmlSourceWidget->blockSignals(true);
-    m_xmlSourceWidget->clear();
-    m_xmlSourceWidget->blockSignals(blocked);
-}
-
-void BarDescriptorEditorWidget::setDirty(bool dirty)
-{
-    m_dirty = dirty;
-    emit changed();
-}
-
-BarDescriptorEditor *BarDescriptorEditorWidget::createEditor()
-{
-    return new BarDescriptorEditor(this);
+void BarDescriptorEditorWidget::updateSourceView()
+{
+    bool blocked = m_xmlSourceWidget->blockSignals(true);
+
+    int line;
+    int column;
+    int position = m_xmlSourceWidget->position();
+    m_xmlSourceWidget->convertPosition(position, &line, &column);
+
+    m_xmlSourceWidget->setPlainText(barDescriptorDocument()->xmlSource());
+
+    m_xmlSourceWidget->gotoLine(line, column);
+
+    m_xmlSourceWidget->blockSignals(blocked);
+}
+
+BarDescriptorDocument *BarDescriptorEditorWidget::barDescriptorDocument() const
+{
+    return qobject_cast<BarDescriptorDocument*>(m_editor->document());
 }
 
=== modified file 'src/qnx/bardescriptoreditorwidget.h'
--- src/qnx/bardescriptoreditorwidget.h	2014-03-18 10:51:43 +0000
+++ src/qnx/bardescriptoreditorwidget.h	2014-06-16 09:46:37 +0000
@@ -36,17 +36,12 @@
 
 #include <QStackedWidget>
 
-namespace Core {
-class IEditor;
-}
+namespace Core { class IEditor; }
 
-namespace ProjectExplorer {
-class PanelsWidget;
-}
+namespace ProjectExplorer { class PanelsWidget; }
 
 namespace TextEditor {
 class PlainTextEditorWidget;
-class TextEditorActionHandler;
 class BaseTextEditorWidget;
 }
 
@@ -67,37 +62,21 @@
     Q_OBJECT
 
 public:
-    explicit BarDescriptorEditorWidget(QWidget *parent, TextEditor::TextEditorActionHandler *handler);
-
-    Core::IEditor *editor() const;
-
-    BarDescriptorEditorEntryPointWidget *entryPointWidget() const;
-    BarDescriptorEditorPackageInformationWidget *packageInformationWidget() const;
-    BarDescriptorEditorAuthorInformationWidget *authorInformationWidget() const;
-
-    BarDescriptorEditorGeneralWidget *generalWidget() const;
-    BarDescriptorEditorPermissionsWidget *permissionsWidget() const;
-    BarDescriptorEditorEnvironmentWidget *environmentWidget() const;
-
-    BarDescriptorEditorAssetsWidget *assetsWidget() const;
+    explicit BarDescriptorEditorWidget(BarDescriptorEditor *editor, QWidget *parent = 0);
 
     TextEditor::BaseTextEditorWidget *sourceWidget() const;
 
     void setFilePath(const QString &filePath);
-    QString xmlSource() const;
-    void setXmlSource(const QString &xmlSource);
-
-    bool isDirty() const;
-    void clear();
-
-public slots:
-    void setDirty(bool dirty = true);
 
 signals:
-    void changed();
+    void changed(BarDescriptorDocument::Tag tag, const QVariant &value);
+
+private slots:
+    void updateDocumentContent();
+    void updateSourceView();
 
 private:
-    BarDescriptorEditor *createEditor();
+    BarDescriptorDocument *barDescriptorDocument() const;
 
     void initGeneralPage();
     void initApplicationPage();
@@ -105,10 +84,7 @@
     void initSourcePage();
     void initPanelSize(ProjectExplorer::PanelsWidget *panelsWidget);
 
-    mutable Core::IEditor *m_editor;
-
-    TextEditor::TextEditorActionHandler *m_handler;
-    bool m_dirty;
+    Core::IEditor *m_editor;
 
     // New UI
     BarDescriptorEditorEntryPointWidget *m_entryPointWidget;
 
=== modified file 'src/qnx/blackberryabstractdeploystep.h'
--- src/qnx/blackberryabstractdeploystep.h	2014-03-18 10:51:43 +0000
+++ src/qnx/blackberryabstractdeploystep.h	2014-06-16 09:46:37 +0000
@@ -43,9 +43,7 @@
 class QEventLoop;
 QT_END_NAMESPACE
 
-namespace Utils {
-class QtcProcess;
-}
+namespace Utils { class QtcProcess; }
 
 namespace Qnx {
 namespace Internal {
 
=== added file 'src/qnx/blackberryapilevelconfiguration.cpp'
--- src/qnx/blackberryapilevelconfiguration.cpp	1970-01-01 00:00:00 +0000
+++ src/qnx/blackberryapilevelconfiguration.cpp	2014-06-16 09:46:37 +0000
@@ -0,0 +1,504 @@
+/**************************************************************************
+**
+** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
+**
+** Contact: BlackBerry ([e-mail])
+** Contact: KDAB ([e-mail])
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "blackberryapilevelconfiguration.h"
+#include "blackberryconfigurationmanager.h"
+#include "blackberryqtversion.h"
+
+#include "qnxtoolchain.h"
+#include "qnxconstants.h"
+
+#include <utils/qtcassert.h>
+
+#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/kitmanager.h>
+#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/toolchainmanager.h>
+#include <projectexplorer/gcctoolchain.h>
+
+#include <qtsupport/baseqtversion.h>
+#include <qtsupport/qtversionmanager.h>
+#include <qtsupport/qtkitinformation.h>
+
+#include <qmakeprojectmanager/qmakekitinformation.h>
+
+#include <debugger/debuggeritemmanager.h>
+#include <debugger/debuggerkitinformation.h>
+
+#include <coreplugin/icore.h>
+
+#include <QFileInfo>
+#include <QDir>
+#include <QMessageBox>
+
+using namespace ProjectExplorer;
+using namespace QtSupport;
+using namespace Utils;
+using namespace Debugger;
+
+namespace Qnx {
+namespace Internal {
+
+const QLatin1String NDKEnvFileKey("NDKEnvFile");
+const QLatin1String NDKPathKey("NDKPath");
+const QLatin1String NDKDisplayNameKey("NDKDisplayName");
+const QLatin1String NDKTargetKey("NDKTarget");
+const QLatin1String NDKHostKey("NDKHost");
+const QLatin1String NDKVersionKey("NDKVersion");
+const QLatin1String NDKAutoDetectionSourceKey("NDKAutoDetectionSource");
+const QLatin1String NDKAutoDetectedKey("NDKAutoDetectedKey");
+
+#ifdef WITH_TESTS
+bool BlackBerryApiLevelConfiguration::m_fakeConfig = false;
+#endif
+
+BlackBerryApiLevelConfiguration::BlackBerryApiLevelConfiguration(const NdkInstallInformation &ndkInstallInfo)
+{
+    QString envFilePath = QnxUtils::envFilePath(ndkInstallInfo.path, ndkInstallInfo.version);
+    QTC_ASSERT(!envFilePath.isEmpty(), return);
+    m_ndkEnvFile = Utils::FileName::fromString(envFilePath);
+    m_displayName = ndkInstallInfo.name;
+    m_qnxEnv = QnxUtils::qnxEnvironmentFromNdkFile(m_ndkEnvFile.toString());
+    QString sep = QString::fromLatin1("/qnx6");
+    // The QNX_TARGET value is using Unix-like separator on all platforms.
+    m_targetName = ndkInstallInfo.target.split(sep).first().split(QLatin1Char('/')).last();
+    m_qnxHost = ndkInstallInfo.host;
+    m_sysRoot = FileName::fromString(ndkInstallInfo.target);
+    m_version = BlackBerryVersionNumber(ndkInstallInfo.version);
+    m_autoDetectionSource = Utils::FileName::fromString(ndkInstallInfo.installationXmlFilePath);
+    ctor();
+}
+
+BlackBerryApiLevelConfiguration::BlackBerryApiLevelConfiguration(const FileName &ndkEnvFile)
+    : m_autoDetectionSource(Utils::FileName())
+{
+    QTC_ASSERT(!QFileInfo(ndkEnvFile.toString()).isDir(), return);
+    m_ndkEnvFile = ndkEnvFile;
+    QString ndkPath = m_ndkEnvFile.parentDir().toString();
+    m_displayName = ndkPath.split(QDir::separator()).last();
+    m_qnxEnv = QnxUtils::qnxEnvironmentFromNdkFile(m_ndkEnvFile.toString());
+
+    QString ndkTarget;
+    foreach (const Utils::EnvironmentItem &item, m_qnxEnv) {
+        if (item.name == QLatin1String("QNX_TARGET"))
+            ndkTarget = item.value;
+
+        else if (item.name == QLatin1String("QNX_HOST"))
+            m_qnxHost = item.value;
+
+    }
+
+    // The QNX_TARGET value is using Unix-like separator on all platforms.
+    QString sep = QString::fromLatin1("/qnx6");
+    m_targetName = ndkTarget.split(sep).first().split(QLatin1Char('/')).last();
+
+    if (QDir(ndkTarget).exists())
+        m_sysRoot = FileName::fromString(ndkTarget);
+
+    m_version = BlackBerryVersionNumber::fromNdkEnvFileName(QFileInfo(m_ndkEnvFile.toString()).baseName());
+    if (m_version.isEmpty())
+        m_version = BlackBerryVersionNumber::fromTargetName(m_targetName);
+
+    ctor();
+}
+
+BlackBerryApiLevelConfiguration::BlackBerryApiLevelConfiguration(const QVariantMap &data)
+{
+    QString envFilePath = data.value(NDKEnvFileKey).toString();
+    QTC_ASSERT(!envFilePath.isEmpty(), return);
+    m_ndkEnvFile = Utils::FileName::fromString(envFilePath);
+    m_displayName = data.value(NDKDisplayNameKey).toString();
+    m_qnxEnv = QnxUtils::qnxEnvironmentFromNdkFile(m_ndkEnvFile.toString());
+    QString sep = QString::fromLatin1("/qnx6");
+    // The QNX_TARGET value is using Unix-like separator on all platforms.
+    m_targetName = data.value(NDKTargetKey).toString().split(sep).first().split(QLatin1Char('/')).last();
+    m_qnxHost = data.value(NDKHostKey).toString();
+    m_sysRoot = FileName::fromString(data.value(NDKTargetKey).toString());
+    m_version = BlackBerryVersionNumber(data.value(NDKVersionKey).toString());
+    if (data.value(QLatin1String(NDKAutoDetectedKey)).toBool())
+        m_autoDetectionSource = Utils::FileName::fromString(data.value(NDKAutoDetectionSourceKey).toString());
+
+    ctor();
+}
+
+void BlackBerryApiLevelConfiguration::ctor()
+{
+    FileName qmake4Path = QnxUtils::executableWithExtension(FileName::fromString(m_qnxHost + QLatin1String("/usr/bin/qmake")));
+    FileName qmake5Path = QnxUtils::executableWithExtension(FileName::fromString(m_qnxHost + QLatin1String("/usr/bin/qt5/qmake")));
+    FileName gccPath = QnxUtils::executableWithExtension(FileName::fromString(m_qnxHost + QLatin1String("/usr/bin/qcc")));
+    FileName deviceGdbPath = QnxUtils::executableWithExtension(FileName::fromString(m_qnxHost + QLatin1String("/usr/bin/ntoarm-gdb")));
+    FileName simulatorGdbPath = QnxUtils::executableWithExtension(FileName::fromString(m_qnxHost + QLatin1String("/usr/bin/ntox86-gdb")));
+
+    if (qmake4Path.toFileInfo().exists())
+        m_qmake4BinaryFile = qmake4Path;
+
+    if (qmake5Path.toFileInfo().exists())
+        m_qmake5BinaryFile = qmake5Path;
+
+    if (gccPath.toFileInfo().exists())
+        m_gccCompiler = gccPath;
+
+    if (deviceGdbPath.toFileInfo().exists())
+        m_deviceDebugger = deviceGdbPath;
+
+    if (simulatorGdbPath.toFileInfo().exists())
+        m_simulatorDebugger = simulatorGdbPath;
+}
+
+QString BlackBerryApiLevelConfiguration::ndkPath() const
+{
+    return m_ndkEnvFile.parentDir().toString();
+}
+
+QString BlackBerryApiLevelConfiguration::displayName() const
+{
+    return m_displayName;
+}
+
+QString BlackBerryApiLevelConfiguration::targetName() const
+{
+    return m_targetName;
+}
+
+QString BlackBerryApiLevelConfiguration::qnxHost() const
+{
+    return m_qnxHost;
+}
+
+BlackBerryVersionNumber BlackBerryApiLevelConfiguration::version() const
+{
+    return m_version;
+}
+
+bool BlackBerryApiLevelConfiguration::isAutoDetected() const
+{
+    return !m_autoDetectionSource.isEmpty();
+}
+
+Utils::FileName BlackBerryApiLevelConfiguration::autoDetectionSource() const
+{
+    return m_autoDetectionSource;
+}
+
+bool BlackBerryApiLevelConfiguration::isActive() const
+{
+    foreach (Kit *kit, KitManager::kits()) {
+        if (kit->isAutoDetected() &&
+                kit->autoDetectionSource() == m_ndkEnvFile.toString())
+            return true;
+    }
+
+    return false;
+}
+
+bool BlackBerryApiLevelConfiguration::isValid() const
+{
+#ifdef WITH_TESTS
+    if (BlackBerryApiLevelConfiguration::fakeConfig())
+        return true;
+#endif
+
+    return ((!m_qmake4BinaryFile.isEmpty() || !m_qmake5BinaryFile.isEmpty()) && !m_gccCompiler.isEmpty()
+             && !m_deviceDebugger.isEmpty() && !m_simulatorDebugger.isEmpty()
+             && m_ndkEnvFile.toFileInfo().exists() && (m_autoDetectionSource.isEmpty() ||
+                                                       m_autoDetectionSource.toFileInfo().exists())
+             && m_sysRoot.toFileInfo().exists());
+}
+
+FileName BlackBerryApiLevelConfiguration::ndkEnvFile() const
+{
+    return m_ndkEnvFile;
+}
+
+FileName BlackBerryApiLevelConfiguration::qmake4BinaryFile() const
+{
+    return m_qmake4BinaryFile;
+}
+
+FileName BlackBerryApiLevelConfiguration::qmake5BinaryFile() const
+{
+    return m_qmake5BinaryFile;
+}
+
+FileName BlackBerryApiLevelConfiguration::gccCompiler() const
+{
+    return m_gccCompiler;
+}
+
+FileName BlackBerryApiLevelConfiguration::deviceDebuger() const
+{
+    return m_deviceDebugger;
+}
+
+FileName BlackBerryApiLevelConfiguration::simulatorDebuger() const
+{
+    return m_simulatorDebugger;
+}
+
+FileName BlackBerryApiLevelConfiguration::sysRoot() const
+{
+    return m_sysRoot;
+}
+
+QList<Utils::EnvironmentItem> BlackBerryApiLevelConfiguration::qnxEnv() const
+{
+    return m_qnxEnv;
+}
+
+QVariantMap BlackBerryApiLevelConfiguration::toMap() const
+{
+    QVariantMap data;
+    data.insert(QLatin1String(Qnx::Constants::QNX_BB_KEY_CONFIGURATION_TYPE),
+                QLatin1String(Qnx::Constants::QNX_BB_APILEVEL_TYPE));
+    data.insert(QLatin1String(NDKEnvFileKey), m_ndkEnvFile.toString());
+    data.insert(QLatin1String(NDKDisplayNameKey), m_displayName);
+    data.insert(QLatin1String(NDKPathKey), ndkPath());
+    data.insert(QLatin1String(NDKTargetKey), m_sysRoot.toString());
+    data.insert(QLatin1String(NDKHostKey), m_qnxHost);
+    data.insert(QLatin1String(NDKVersionKey), m_version.toString());
+    data.insert(QLatin1String(NDKAutoDetectionSourceKey), m_autoDetectionSource.toString());
+    data.insert(QLatin1String(NDKAutoDetectedKey), isAutoDetected());
+    return data;
+}
+
+QnxAbstractQtVersion *BlackBerryApiLevelConfiguration::createQtVersion(
+        const FileName &qmakePath, Qnx::QnxArchitecture arch, const QString &versionName)
+{
+    QnxAbstractQtVersion *version = new BlackBerryQtVersion(
+            arch, qmakePath, true, QString(), m_ndkEnvFile.toString());
+    version->setDisplayName(tr("Qt %1 for %2").arg(version->qtVersionString(), versionName));
+    QtVersionManager::addVersion(version);
+    return version;
+}
+
+QnxToolChain *BlackBerryApiLevelConfiguration::createToolChain(
+        ProjectExplorer::Abi abi, const QString &versionName)
+{
+    QnxToolChain* toolChain = new QnxToolChain(ToolChain::AutoDetection);
+    toolChain->setDisplayName(tr("QCC for %1").arg(versionName));
+    toolChain->setCompilerCommand(m_gccCompiler);
+    toolChain->setNdkPath(ndkPath());
+    if (abi.isValid())
+        toolChain->setTargetAbi(abi);
+    ToolChainManager::registerToolChain(toolChain);
+    return toolChain;
+}
+
+QVariant BlackBerryApiLevelConfiguration::createDebuggerItem(
+        QList<ProjectExplorer::Abi> abis, Qnx::QnxArchitecture arch, const QString &versionName)
+{
+    Utils::FileName command = arch == X86 ? m_simulatorDebugger : m_deviceDebugger;
+    DebuggerItem debugger;
+    debugger.setCommand(command);
+    debugger.setEngineType(GdbEngineType);
+    debugger.setAutoDetected(true);
+    debugger.setAbis(abis);
+    debugger.setDisplayName(tr("Debugger for %1").arg(versionName));
+    return DebuggerItemManager::registerDebugger(debugger);
+}
+
+Kit *BlackBerryApiLevelConfiguration::createKit(
+        QnxAbstractQtVersion *version, QnxToolChain *toolChain, const QVariant &debuggerItemId)
+{
+    Kit *kit = new Kit;
+    bool isSimulator = version->architecture() == X86;
+
+    QtKitInformation::setQtVersion(kit, version);
+    ToolChainKitInformation::setToolChain(kit, toolChain);
+
+    if (debuggerItemId.isValid())
+        DebuggerKitInformation::setDebugger(kit, debuggerItemId);
+
+    if (version->qtVersion().majorVersion == 4) {
+        if (isSimulator) {
+            QmakeProjectManager::QmakeKitInformation::setMkspec(
+                     kit, FileName::fromLatin1("blackberry-x86-qcc"));
+        } else {
+            QmakeProjectManager::QmakeKitInformation::setMkspec(
+                     kit, FileName::fromLatin1("blackberry-armv7le-qcc"));
+        }
+    }
+
+    DeviceTypeKitInformation::setDeviceTypeId(kit, Constants::QNX_BB_OS_TYPE);
+    SysRootKitInformation::setSysRoot(kit, m_sysRoot);
+
+    kit->setDisplayName(version->displayName());
+    kit->setIconPath(FileName::fromString(QLatin1String(Constants::QNX_BB_CATEGORY_ICON)));
+
+    kit->setAutoDetected(true);
+    kit->setAutoDetectionSource(m_ndkEnvFile.toString());
+    kit->setMutable(DeviceKitInformation::id(), true);
+
+    kit->setSticky(QtKitInformation::id(), true);
+    kit->setSticky(ToolChainKitInformation::id(), true);
+    kit->setSticky(DeviceTypeKitInformation::id(), true);
+    kit->setSticky(SysRootKitInformation::id(), true);
+    kit->setSticky(DebuggerKitInformation::id(), true);
+    kit->setSticky(QmakeProjectManager::QmakeKitInformation::id(), true);
+
+    KitManager::registerKit(kit);
+    return kit;
+}
+
+bool BlackBerryApiLevelConfiguration::activate()
+{
+    if (!isValid()) {
+        if (!m_autoDetectionSource.isEmpty())
+            return false;
+
+        QString errorMessage = tr("The following errors occurred while activating target: %1").arg(m_targetName);
+        if (m_qmake4BinaryFile.isEmpty() && m_qmake5BinaryFile.isEmpty())
+            errorMessage += QLatin1Char('\n') + tr("- No Qt version found.");
+
+        if (m_gccCompiler.isEmpty())
+            errorMessage += QLatin1Char('\n') + tr("- No GCC compiler found.");
+
+        if (m_deviceDebugger.isEmpty())
+            errorMessage += QLatin1Char('\n') + tr("- No GDB debugger found for BB10 Device.");
+
+        if (!m_simulatorDebugger.isEmpty())
+            errorMessage += QLatin1Char('\n') + tr("- No GDB debugger found for BB10 Simulator.");
+
+        QMessageBox::warning(Core::ICore::mainWindow(), tr("Cannot Set up BB10 Configuration"),
+                             errorMessage, QMessageBox::Ok);
+        return false;
+    }
+
+    if (isActive())
+        return true;
+
+    deactivate(); // cleaning-up artifacts autodetected by old QtCreator versions
+
+    QString armVersionName = tr("BlackBerry %1 Device").arg(m_version.toString());
+    QString x86VersionName = tr("BlackBerry %1 Simulator").arg(m_version.toString());
+
+    // create versions
+    QnxAbstractQtVersion *qt4ArmVersion = 0;
+    QnxAbstractQtVersion *qt4X86Version = 0;
+    QnxAbstractQtVersion *qt5ArmVersion = 0;
+    QnxAbstractQtVersion *qt5X86Version = 0;
+    QList<Abi> armAbis;
+    QList<Abi> x86Abis;
+
+    if (!m_qmake4BinaryFile.isEmpty()) {
+        qt4ArmVersion = createQtVersion(m_qmake4BinaryFile, Qnx::ArmLeV7, armVersionName);
+        armAbis << qt4ArmVersion->qtAbis();
+        qt4X86Version = createQtVersion(m_qmake4BinaryFile, Qnx::X86, x86VersionName);
+        x86Abis << qt4X86Version->qtAbis();
+    }
+    if (!m_qmake5BinaryFile.isEmpty()) {
+        qt5ArmVersion = createQtVersion(m_qmake5BinaryFile, Qnx::ArmLeV7, armVersionName);
+        foreach (Abi abi, qt5ArmVersion->qtAbis())
+            if (!armAbis.contains(abi))
+                armAbis << abi;
+        qt5X86Version = createQtVersion(m_qmake5BinaryFile, Qnx::X86, x86VersionName);
+        foreach (Abi abi, qt5X86Version->qtAbis())
+            if (!x86Abis.contains(abi))
+                x86Abis << abi;
+    }
+
+    // create toolchains
+    QnxToolChain *armToolChain = createToolChain(
+                !armAbis.isEmpty() ? armAbis.first() : Abi(), armVersionName);
+    QnxToolChain *x86ToolChain = createToolChain(
+                !x86Abis.isEmpty() ? x86Abis.first() : Abi(), x86VersionName);
+
+    // create debuggers
+    QVariant armDebuggerItemId = createDebuggerItem(armAbis, Qnx::ArmLeV7, armVersionName);
+    QVariant x86DebuggerItemId = createDebuggerItem(x86Abis, Qnx::X86, x86VersionName);
+
+    // create kits
+    if (qt4ArmVersion)
+        createKit(qt4ArmVersion, armToolChain, armDebuggerItemId);
+    if (qt4X86Version)
+        createKit(qt4X86Version, x86ToolChain, x86DebuggerItemId);
+    if (qt5ArmVersion)
+        createKit(qt5ArmVersion, armToolChain, armDebuggerItemId);
+    if (qt5X86Version)
+        createKit(qt5X86Version, x86ToolChain, x86DebuggerItemId);
+
+    BlackBerryConfigurationManager::instance()->emitSettingsChanged();
+
+    return true;
+}
+
+void BlackBerryApiLevelConfiguration::deactivate()
+{
+    QList<BaseQtVersion *> qtvToRemove;
+    QList<ToolChain *> tcToRemove;
+    QList<const DebuggerItem *> dbgToRemove;
+
+    foreach (Kit *kit, KitManager::kits()) {
+        if (kit->isAutoDetected() &&
+                kit->autoDetectionSource() == ndkEnvFile().toString()) {
+            BaseQtVersion *version = QtKitInformation::qtVersion(kit);
+            ToolChain *toolChain = ToolChainKitInformation::toolChain(kit);
+            const DebuggerItem *debugger = DebuggerKitInformation::debugger(kit);
+            // Kit's Qt version, tool chain or debugger might be used by other BB kits
+            // generated for the same API level that are not yet unregistered. This triggers warning outputs.
+            // Let's unregistered/removed them later once all API level kits are unregistered.
+            if (version && !qtvToRemove.contains(version))
+                qtvToRemove << version;
+            if (toolChain && !tcToRemove.contains(toolChain))
+                tcToRemove << toolChain;
+            if (debugger && !dbgToRemove.contains(debugger))
+                dbgToRemove << debugger;
+
+            KitManager::deregisterKit(kit);
+        }
+    }
+
+    foreach (BaseQtVersion *qtv, qtvToRemove)
+        QtVersionManager::removeVersion(qtv);
+
+    foreach (ToolChain *tc, tcToRemove)
+        ToolChainManager::deregisterToolChain(tc);
+
+    foreach (const DebuggerItem *debugger, dbgToRemove)
+        DebuggerItemManager::deregisterDebugger(debugger->id());
+
+    BlackBerryConfigurationManager::instance()->emitSettingsChanged();
+}
+
+#ifdef WITH_TESTS
+void BlackBerryApiLevelConfiguration::setFakeConfig(bool fakeConfig)
+{
+    m_fakeConfig = fakeConfig;
+}
+
+bool BlackBerryApiLevelConfiguration::fakeConfig()
+{
+    return m_fakeConfig;
+}
+#endif
+
+} // namespace Internal
+} // namespace Qnx
 
=== added file 'src/qnx/blackberryapilevelconfiguration.h'
--- src/qnx/blackberryapilevelconfiguration.h	1970-01-01 00:00:00 +0000
+++ src/qnx/blackberryapilevelconfiguration.h	2014-06-16 09:46:37 +0000
@@ -0,0 +1,125 @@
+/**************************************************************************
+**
+** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
+**
+** Contact: BlackBerry ([e-mail])
+** Contact: KDAB ([e-mail])
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef BLACKBERRYCONFIGURATIONS_H
+#define BLACKBERRYCONFIGURATIONS_H
+
+#include "qnxutils.h"
+#include "blackberryversionnumber.h"
+#include "qnxconstants.h"
+
+#include <utils/environment.h>
+#include <utils/fileutils.h>
+
+#include <projectexplorer/abi.h>
+#include <projectexplorer/kit.h>
+
+#include <QObject>
+#include <QCoreApplication>
+
+namespace QtSupport { class BaseQtVersion; }
+namespace Debugger { class DebuggerItem; }
+
+namespace Qnx {
+namespace Internal {
+
+class QnxAbstractQtVersion;
+class QnxToolChain;
+
+class BlackBerryApiLevelConfiguration
+{
+    Q_DECLARE_TR_FUNCTIONS(Qnx::Internal::BlackBerryApiLevelConfiguration)
+public:
+    BlackBerryApiLevelConfiguration(const NdkInstallInformation &ndkInstallInfo);
+    BlackBerryApiLevelConfiguration(const Utils::FileName &ndkEnvFile);
+    BlackBerryApiLevelConfiguration(const QVariantMap &data);
+    bool activate();
+    void deactivate();
+    QString ndkPath() const;
+    QString displayName() const;
+    QString targetName() const;
+    QString qnxHost() const;
+    BlackBerryVersionNumber version() const;
+    bool isAutoDetected() const;
+    Utils::FileName autoDetectionSource() const;
+    bool isActive() const;
+    bool isValid() const;
+    Utils::FileName ndkEnvFile() const;
+    Utils::FileName qmake4BinaryFile() const;
+    Utils::FileName qmake5BinaryFile() const;
+    Utils::FileName gccCompiler() const;
+    Utils::FileName deviceDebuger() const;
+    Utils::FileName simulatorDebuger() const;
+    Utils::FileName sysRoot() const;
+    QList<Utils::EnvironmentItem> qnxEnv() const;
+    QVariantMap toMap() const;
+
+#ifdef WITH_TESTS
+    static void setFakeConfig(bool fakeConfig);
+    static bool fakeConfig();
+#endif
+
+private:
+    QString m_displayName;
+    QString m_targetName;
+    QString m_qnxHost;
+    BlackBerryVersionNumber m_version;
+    Utils::FileName m_autoDetectionSource;
+    Utils::FileName m_ndkEnvFile;
+    Utils::FileName m_qmake4BinaryFile;
+    Utils::FileName m_qmake5BinaryFile;
+    Utils::FileName m_gccCompiler;
+    Utils::FileName m_deviceDebugger;
+    Utils::FileName m_simulatorDebugger;
+    Utils::FileName m_sysRoot;
+    QList<Utils::EnvironmentItem> m_qnxEnv;
+
+    void ctor();
+
+    QnxAbstractQtVersion* createQtVersion(
+            const Utils::FileName &qmakePath, Qnx::QnxArchitecture arch, const QString &versionName);
+    QnxToolChain* createToolChain(
+            ProjectExplorer::Abi abi, const QString &versionName);
+    QVariant createDebuggerItem(
+            QList<ProjectExplorer::Abi> abis, Qnx::QnxArchitecture arch, const QString &versionName);
+    ProjectExplorer::Kit* createKit(
+            QnxAbstractQtVersion* version, QnxToolChain* toolChain,
+            const QVariant &debuggerItemId);
+
+#ifdef WITH_TESTS
+    static bool m_fakeConfig;
+#endif
+};
+
+} // namespace Internal
+} // namespace Qnx
+
+#endif // BLACKBERRYCONFIGURATIONS_H
 
=== modified file 'src/qnx/blackberryapplicationrunner.cpp'
--- src/qnx/blackberryapplicationrunner.cpp	2014-03-18 10:51:43 +0000
+++ src/qnx/blackberryapplicationrunner.cpp	2014-06-16 09:46:37 +0000
@@ -35,17 +35,25 @@
 #include "blackberrydeviceconnectionmanager.h"
 #include "blackberryrunconfiguration.h"
 #include "blackberrylogprocessrunner.h"
+#include "blackberrydeviceinformation.h"
 #include "qnxconstants.h"
 
+#include <coreplugin/icore.h>
+#include <projectexplorer/kit.h>
 #include <projectexplorer/target.h>
 #include <qmakeprojectmanager/qmakebuildconfiguration.h>
+#include <debugger/debuggerrunconfigurationaspect.h>
 #include <ssh/sshremoteprocessrunner.h>
 #include <utils/qtcassert.h>
 
+#include <QMessageBox>
 #include <QTimer>
 #include <QDir>
+#include <QTemporaryFile>
 
 namespace {
+enum { debugCheckQmlJSArgs = 0 };
+
 bool parseRunningState(const QString &line)
 {
     QTC_ASSERT(line.startsWith(QLatin1String("result::")), return false);
@@ -57,18 +65,21 @@
 using namespace Qnx;
 using namespace Qnx::Internal;
 
-BlackBerryApplicationRunner::BlackBerryApplicationRunner(bool debugMode, BlackBerryRunConfiguration *runConfiguration, QObject *parent)
+BlackBerryApplicationRunner::BlackBerryApplicationRunner(const BlackBerryApplicationRunner::LaunchFlags &launchFlags, BlackBerryRunConfiguration *runConfiguration, QObject *parent)
     : QObject(parent)
-    , m_debugMode(debugMode)
+    , m_launchFlags(launchFlags)
     , m_pid(-1)
     , m_appId(QString())
     , m_running(false)
     , m_stopping(false)
     , m_launchProcess(0)
     , m_stopProcess(0)
+    , m_deviceInfo(0)
     , m_logProcessRunner(0)
     , m_runningStateTimer(new QTimer(this))
     , m_runningStateProcess(0)
+    , m_qmlDebugServerPort(0)
+    , m_checkQmlJsDebugArgumentsProcess(0)
 {
     QTC_ASSERT(runConfiguration, return);
 
@@ -77,6 +88,9 @@
     m_environment = buildConfig->environment();
     m_deployCmd = m_environment.searchInPath(QLatin1String(Constants::QNX_BLACKBERRY_DEPLOY_CMD));
 
+    QFileInfo fi(target->kit()->autoDetectionSource());
+    m_bbApiLevelVersion = BlackBerryVersionNumber::fromNdkEnvFileName(fi.baseName());
+
     m_device = BlackBerryDeviceConfiguration::device(target->kit());
     m_barPackage = runConfiguration->barPackage();
 
@@ -84,6 +98,11 @@
     m_sshParams = m_device->sshParameters();
     m_sshParams.authenticationType = QSsh::SshConnectionParameters::AuthenticationTypePublicKey;
 
+    Debugger::DebuggerRunConfigurationAspect *aspect =
+    runConfiguration->extraAspect<Debugger::DebuggerRunConfigurationAspect>();
+    if (aspect)
+        m_qmlDebugServerPort = aspect->qmlDebugServerPort();
+
     m_runningStateTimer->setInterval(3000);
     m_runningStateTimer->setSingleShot(true);
     connect(m_runningStateTimer, SIGNAL(timeout()), this, SLOT(determineRunningState()));
@@ -97,14 +116,14 @@
 {
     if (!BlackBerryDeviceConnectionManager::instance()->isConnected(m_device->id())) {
         connect(BlackBerryDeviceConnectionManager::instance(), SIGNAL(deviceConnected()),
-                this, SLOT(launchApplication()));
+                this, SLOT(checkDeployMode()));
         connect(BlackBerryDeviceConnectionManager::instance(), SIGNAL(deviceDisconnected(Core::Id)),
                 this, SLOT(disconnectFromDeviceSignals(Core::Id)));
         connect(BlackBerryDeviceConnectionManager::instance(), SIGNAL(connectionOutput(Core::Id,QString)),
                 this, SLOT(displayConnectionOutput(Core::Id,QString)));
         BlackBerryDeviceConnectionManager::instance()->connectDevice(m_device->id());
     } else {
-        launchApplication();
+        checkDeployMode();
     }
 }
 
@@ -131,6 +150,52 @@
         emit output(msg, Utils::StdErrFormat);
 }
 
+void BlackBerryApplicationRunner::checkDeviceRuntimeVersion(int status)
+{
+    if (status != BlackBerryNdkProcess::Success) {
+        emit output(tr("Cannot determine device runtime version."), Utils::StdErrFormat);
+        return;
+    }
+
+    if (m_bbApiLevelVersion.isEmpty()) {
+        emit output(tr("Cannot determine API level version."), Utils::StdErrFormat);
+        checkQmlJsDebugArguments();
+        return;
+    }
+
+    const QString runtimeVersion = m_deviceInfo->scmBundle();
+    if (m_bbApiLevelVersion.toString() != runtimeVersion) {
+        const QMessageBox::StandardButton answer =
+                QMessageBox::question(Core::ICore::mainWindow(),
+                                      tr("Confirmation"),
+                                      tr("The device runtime version(%1) does not match "
+                                         "the API level version(%2).\n"
+                                         "This may cause unexpected behavior when debugging.\n"
+                                         "Do you want to continue anyway?")
+                                      .arg(runtimeVersion, m_bbApiLevelVersion.toString()),
+                                      QMessageBox::Yes | QMessageBox::No);
+
+        if (answer == QMessageBox::No) {
+            emit startFailed(tr("API level version does not match Runtime version."));
+            return;
+        }
+    }
+
+    checkQmlJsDebugArguments();
+}
+
+void BlackBerryApplicationRunner::queryDeviceInformation()
+{
+    if (!m_deviceInfo) {
+        m_deviceInfo = new BlackBerryDeviceInformation(this);
+        connect(m_deviceInfo, SIGNAL(finished(int)),
+                this, SLOT(checkDeviceRuntimeVersion(int)));
+    }
+
+    m_deviceInfo->setDeviceTarget(m_sshParams.host, m_sshParams.password);
+    emit output(tr("Querying device runtime version..."), Utils::StdOutFormat);
+}
+
 void BlackBerryApplicationRunner::startFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
     if (exitCode == 0 && exitStatus == QProcess::NormalExit && m_pid > -1) {
@@ -219,7 +284,7 @@
 {
     if (m_device->id() == deviceId) {
         disconnect(BlackBerryDeviceConnectionManager::instance(), SIGNAL(deviceConnected()),
-                   this, SLOT(launchApplication()));
+                   this, SLOT(checkDeployMode()));
         disconnect(BlackBerryDeviceConnectionManager::instance(), SIGNAL(deviceDisconnected(Core::Id)),
                    this, SLOT(disconnectFromDeviceSignals(Core::Id)));
         disconnect(BlackBerryDeviceConnectionManager::instance(), SIGNAL(connectionOutput(Core::Id,QString)),
@@ -237,6 +302,105 @@
     m_appId = applicationId;
 }
 
+void BlackBerryApplicationRunner::checkQmlJsDebugArguments()
+{
+    if (!m_launchFlags.testFlag(QmlDebugLaunch)) {
+        // no need to change anytning in app manifest for this kind of run
+        launchApplication();
+    }
+
+    emit output(tr("Checking qmljsdebugger command line argument."), Utils::StdOutFormat);
+    QString nativePackagerCmd = m_environment.searchInPath(QLatin1String("blackberry-nativepackager"));
+    if (nativePackagerCmd.isEmpty()) {
+        emit output(tr("Cannot find Native Packager executable."), Utils::StdErrFormat);
+        return;
+    }
+
+    m_checkQmlJsDebugArgumentsProcess = new QProcess(this);
+    connect(m_checkQmlJsDebugArgumentsProcess, SIGNAL(error(QProcess::ProcessError)), this, SLOT(checkQmlJsDebugArgumentsManifestLoaded()));
+    connect(m_checkQmlJsDebugArgumentsProcess, SIGNAL(finished(int)), this, SLOT(checkQmlJsDebugArgumentsManifestLoaded()));
+
+    QStringList args;
+    args << QLatin1String("-listManifest") << QDir::toNativeSeparators(m_barPackage);
+    if (debugCheckQmlJSArgs)
+        qDebug() << "get manifest:" << nativePackagerCmd << args.join(QLatin1String(" "));
+    m_checkQmlJsDebugArgumentsProcess->start(nativePackagerCmd, args);
+}
+
+void BlackBerryApplicationRunner::checkQmlJsDebugArgumentsManifestLoaded()
+{
+    m_checkQmlJsDebugArgumentsProcess->deleteLater();
+
+    if (m_checkQmlJsDebugArgumentsProcess->exitStatus() != QProcess::NormalExit) {
+        emit output(tr("Cannot read bar package manifest."), Utils::StdErrFormat);
+        qWarning() << "Cannot read bar package manifest:" << m_checkQmlJsDebugArgumentsProcess->errorString();
+        qWarning() << m_checkQmlJsDebugArgumentsProcess->readAllStandardError();
+        return;
+    }
+
+    QString manifestContent = QString::fromUtf8(m_checkQmlJsDebugArgumentsProcess->readAllStandardOutput());
+
+    QRegExp rxEoln(QLatin1String("(\\r\\n|\\n|\\r)"));
+    QStringList manifestLines = manifestContent.split(rxEoln);
+
+    QMutableListIterator<QString> it(manifestLines);
+    QLatin1String entryPoint("Entry-Point: ");
+    while (it.hasNext()) {
+        it.next();
+        if (it.value().startsWith(entryPoint)) {
+            while (it.hasNext() && it.peekNext().startsWith(QLatin1Char(' ')))
+                it.next();
+            QString qmljsdbgArg = QString::fromLatin1("-qmljsdebugger=port:%1%2")
+                .arg(m_qmlDebugServerPort)
+                .arg(m_launchFlags.testFlag(QmlDebugLaunchBlocking)? QLatin1String(",block"): QLatin1String(""));
+            it.insert(QLatin1String("  ") + qmljsdbgArg);
+            manifestContent = manifestLines.join(QLatin1String("\n"));
+            break;
+        }
+    }
+
+    m_checkQmlJsDebugArgumentsProcess = new QProcess(this);
+    connect(m_checkQmlJsDebugArgumentsProcess, SIGNAL(error(QProcess::ProcessError)), this, SLOT(checkQmlJsDebugArgumentsManifestSaved()));
+    connect(m_checkQmlJsDebugArgumentsProcess, SIGNAL(finished(int)), this, SLOT(checkQmlJsDebugArgumentsManifestSaved()));
+
+    QTemporaryFile *manifestFile = new QTemporaryFile(m_checkQmlJsDebugArgumentsProcess);
+    if (!manifestFile->open()) {
+        emit output(tr("Internal error: Cannot create temporary manifest file '%1'")
+            .arg(manifestFile->fileName()), Utils::StdErrFormat);
+        delete manifestFile;
+        return;
+    }
+
+    manifestFile->write(manifestContent.toUtf8());
+    manifestFile->flush();
+
+    QStringList args;
+    args << QLatin1String("-device") << m_sshParams.host;
+    if (!m_sshParams.password.isEmpty())
+        args << QLatin1String("-password") << m_sshParams.password;
+    args << QLatin1String("-package") << QDir::toNativeSeparators(m_barPackage);
+    args << QLatin1String("-putFile");
+    args << manifestFile->fileName();
+    args << QLatin1String("app/META-INF/MANIFEST.MF");
+    if (debugCheckQmlJSArgs)
+        qDebug() << "set manifest:" << m_deployCmd << args.join(QLatin1String(" "));
+    m_checkQmlJsDebugArgumentsProcess->start(m_deployCmd, args);
+}
+
+void BlackBerryApplicationRunner::checkQmlJsDebugArgumentsManifestSaved()
+{
+    m_checkQmlJsDebugArgumentsProcess->deleteLater();
+
+    if (m_checkQmlJsDebugArgumentsProcess->exitStatus() != QProcess::NormalExit) {
+        emit output(tr("Cannot set command line arguments."), Utils::StdErrFormat);
+        qWarning() << "Cannot set command line arguments:" << m_checkQmlJsDebugArgumentsProcess->errorString();
+        qWarning() << m_checkQmlJsDebugArgumentsProcess->readAllStandardError();
+        return;
+    }
+
+    launchApplication();
+}
+
 void BlackBerryApplicationRunner::launchApplication()
 {
     // If original device connection fails before launching, this method maybe triggered
@@ -246,12 +410,12 @@
 
     QStringList args;
     args << QLatin1String("-launchApp");
-    if (m_debugMode)
+    if (m_launchFlags.testFlag(CppDebugLaunch))
         args << QLatin1String("-debugNative");
     args << QLatin1String("-device") << m_sshParams.host;
     if (!m_sshParams.password.isEmpty())
         args << QLatin1String("-password") << m_sshParams.password;
-    args << QDir::toNativeSeparators(m_barPackage);
+    args << QLatin1String("-package") << QDir::toNativeSeparators(m_barPackage);
 
     if (!m_launchProcess) {
         m_launchProcess = new QProcess(this);
@@ -262,12 +426,26 @@
 
         m_launchProcess->setEnvironment(m_environment.toStringList());
     }
-
+    if (debugCheckQmlJSArgs)
+        qDebug() << "launch:" << m_deployCmd << args.join(QLatin1String(" "));
     m_launchProcess->start(m_deployCmd, args);
     m_runningStateTimer->start();
     m_running = true;
 }
 
+void BlackBerryApplicationRunner::checkDeployMode()
+{
+    // If original device connection fails before launching, this method maybe triggered
+    // if any other device is connected
+    if (!BlackBerryDeviceConnectionManager::instance()->isConnected(m_device->id()))
+        return;
+
+    if (m_launchFlags.testFlag(CppDebugLaunch))
+        queryDeviceInformation(); // check API version vs Runtime version
+    else
+        checkQmlJsDebugArguments();
+}
+
 void BlackBerryApplicationRunner::startRunningStateTimer()
 {
     if (m_running)
 
=== modified file 'src/qnx/blackberryapplicationrunner.h'
--- src/qnx/blackberryapplicationrunner.h	2014-03-18 10:51:43 +0000
+++ src/qnx/blackberryapplicationrunner.h	2014-06-16 09:46:37 +0000
@@ -34,6 +34,7 @@
 
 #include "blackberrydeviceconfiguration.h"
 #include "blackberryprocessparser.h"
+#include "blackberryversionnumber.h"
 
 #include <projectexplorer/runconfiguration.h>
 
@@ -44,29 +45,37 @@
 #include <QProcess>
 #include <QDateTime>
 
-namespace QSsh {
-class SshRemoteProcessRunner;
-}
+namespace QSsh { class SshRemoteProcessRunner; }
 
 namespace Qnx {
 namespace Internal {
 
 class BlackBerryRunConfiguration;
 class BlackBerryLogProcessRunner;
+class BlackBerryDeviceInformation;
 
 class BlackBerryApplicationRunner : public QObject
 {
     Q_OBJECT
 public:
-    explicit BlackBerryApplicationRunner(bool debugMode, BlackBerryRunConfiguration *runConfiguration, QObject *parent = 0);
+    enum LaunchFlag
+    {
+        CppDebugLaunch = 0x1,
+        QmlDebugLaunch = 0x2,
+        QmlDebugLaunchBlocking = 0x4,
+        QmlProfilerLaunch = 0x8
+    };
+    Q_DECLARE_FLAGS(LaunchFlags, LaunchFlag)
+
+public:
+    explicit BlackBerryApplicationRunner(const LaunchFlags &launchFlags, BlackBerryRunConfiguration *runConfiguration, QObject *parent = 0);
 
     bool isRunning() const;
     qint64 pid() const;
 
-    ProjectExplorer::RunControl::StopResult stop();
-
 public slots:
     void start();
+    ProjectExplorer::RunControl::StopResult stop();
 
 signals:
     void output(const QString &msg, Utils::OutputFormat format);
@@ -91,14 +100,21 @@
     void setApplicationId(const QString &applicationId);
 
     void launchApplication();
+    void checkDeployMode();
     void startLogProcessRunner();
 
     void displayConnectionOutput(Core::Id deviceId, const QString &output);
+    void checkDeviceRuntimeVersion(int status);
+
+    void checkQmlJsDebugArguments();
+    void checkQmlJsDebugArgumentsManifestLoaded();
+    void checkQmlJsDebugArgumentsManifestSaved();
 
 private:
     void reset();
+    void queryDeviceInformation();
 
-    bool m_debugMode;
+    LaunchFlags m_launchFlags;
 
     qint64 m_pid;
     QString m_appId;
@@ -115,11 +131,17 @@
     QProcess *m_launchProcess;
     QProcess *m_stopProcess;
     BlackBerryProcessParser m_launchStopProcessParser;
+    BlackBerryDeviceInformation *m_deviceInfo;
 
     BlackBerryLogProcessRunner *m_logProcessRunner;
 
     QTimer *m_runningStateTimer;
     QProcess *m_runningStateProcess;
+
+    BlackBerryVersionNumber m_bbApiLevelVersion;
+
+    int m_qmlDebugServerPort;
+    QProcess *m_checkQmlJsDebugArgumentsProcess;
 };
 
 } // namespace Internal
 
=== modified file 'src/qnx/blackberrycertificate.cpp'
--- src/qnx/blackberrycertificate.cpp	2014-03-18 10:51:43 +0000
+++ src/qnx/blackberrycertificate.cpp	2014-06-16 09:46:37 +0000
@@ -30,7 +30,7 @@
 ****************************************************************************/
 
 #include "blackberrycertificate.h"
-#include "blackberryconfiguration.h"
+#include "blackberryapilevelconfiguration.h"
 #include "blackberryconfigurationmanager.h"
 #include "blackberryndkprocess.h"
 
@@ -54,7 +54,7 @@
 {
     m_process->setProcessChannelMode(QProcess::MergedChannels);
     m_process->setEnvironment(Utils::EnvironmentItem::toStringList(
-             BlackBerryConfigurationManager::instance().defaultQnxEnv()));
+             BlackBerryConfigurationManager::instance()->defaultConfigurationEnv()));
 }
 
 void BlackBerryCertificate::load()
 
=== added file 'src/qnx/blackberrycheckdevicestatusstep.cpp'
--- src/qnx/blackberrycheckdevicestatusstep.cpp	1970-01-01 00:00:00 +0000
+++ src/qnx/blackberrycheckdevicestatusstep.cpp	2014-06-16 09:46:37 +0000
@@ -0,0 +1,278 @@
+/**************************************************************************
+**
+** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
+**
+** Contact: BlackBerry ([e-mail])
+** Contact: KDAB ([e-mail])
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "blackberrycheckdevicestatusstep.h"
+
+#include "blackberrycheckdevicestatusstepconfigwidget.h"
+#include "blackberrydeviceinformation.h"
+#include "blackberryversionnumber.h"
+#include "qnxconstants.h"
+
+#include <projectexplorer/buildconfiguration.h>
+#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/target.h>
+#include <projectexplorer/kit.h>
+#include <projectexplorer/task.h>
+#include <ssh/sshconnection.h>
+
+#include <coreplugin/icore.h>
+
+#include <qfileinfo.h>
+
+#include <qmessagebox.h>
+
+#include <qeventloop.h>
+
+using namespace Qnx;
+using namespace Qnx::Internal;
+
+namespace {
+const char RUNTIME_CHECK_ENABLED[]     =
+        "Qnx.Internal.BlackBerryCheckDeviceStatusStep.RuntimeCheckEnabled";
+const char DEBUG_TOKEN_CHECK_ENABLED[] =
+        "Qnx.Internal.BlackBerryCheckDeviceStatusStep.DebugTokenCheckEnabled";
+}
+
+BlackBerryCheckDeviceStatusStep::BlackBerryCheckDeviceStatusStep(ProjectExplorer::BuildStepList *bsl) :
+    ProjectExplorer::BuildStep(bsl, Core::Id(Constants::QNX_CHECK_DEVICE_STATUS_BS_ID))
+  , m_deviceInfo(0)
+  , m_eventLoop(0)
+  , m_runtimeCheckEnabled(true)
+  , m_debugTokenCheckEnabled(true)
+{
+    setDisplayName(tr("Check Device Status"));
+}
+
+BlackBerryCheckDeviceStatusStep::BlackBerryCheckDeviceStatusStep(ProjectExplorer::BuildStepList *bsl,
+                                                                 BlackBerryCheckDeviceStatusStep *bs) :
+    ProjectExplorer::BuildStep(bsl, bs)
+  , m_deviceInfo(0)
+  , m_eventLoop(0)
+  , m_runtimeCheckEnabled(true)
+  , m_debugTokenCheckEnabled(true)
+{
+    setDisplayName(tr("Check Device Status"));
+}
+
+void BlackBerryCheckDeviceStatusStep::checkDeviceInfo(int status)
+{
+    if (!m_runtimeCheckEnabled && m_debugTokenCheckEnabled) {
+        // Skip debug token check for internal non secure devices and simulators
+        if (!m_deviceInfo->isProductionDevice() || m_deviceInfo->isSimulator()) {
+            m_eventLoop->exit(true);
+            return;
+        }
+    }
+
+    if (status != BlackBerryDeviceInformation::Success) {
+        switch (status) {
+        case BlackBerryDeviceInformation::AuthenticationFailed:
+            raiseError(tr("Authentication failed."));
+            break;
+        case BlackBerryDeviceInformation::NoRouteToHost:
+            raiseError(tr("Cannot connect to device."));
+            break;
+        case BlackBerryDeviceInformation::DevelopmentModeDisabled:
+            raiseError(tr("Device is not in the development mode."));
+            break;
+        case BlackBerryDeviceInformation::InferiorProcessTimedOut:
+            raiseError(tr("Timeout querying device information."));
+            break;
+        case BlackBerryDeviceInformation::FailedToStartInferiorProcess:
+            raiseError(tr("Failed to query device information."));
+            break;
+        case BlackBerryDeviceInformation::InferiorProcessCrashed:
+            raiseError(tr("Process to query device information has crashed."));
+            break;
+        default:
+            raiseError(tr("Cannot query device information."));
+            break;
+        }
+        m_eventLoop->exit(false);
+        return;
+    }
+
+    if (m_debugTokenCheckEnabled && !m_deviceInfo->debugTokenValid()) {
+        //: %1: Error message from BlackBerryDeviceInformation
+        const QString errorMsg =
+            tr("%1. Upload a valid debug token into the device.")
+            .arg(m_deviceInfo->debugTokenValidationError());
+        raiseError(errorMsg);
+        m_eventLoop->exit(false);
+        return;
+    }
+
+    if (m_runtimeCheckEnabled) {
+        BlackBerryVersionNumber deviceRuntimeVersion(m_deviceInfo->scmBundle());
+        QFileInfo fi(target()->kit()->autoDetectionSource());
+
+        if (deviceRuntimeVersion.isEmpty()) {
+            // Skip the check if device runtime is not determined
+            m_eventLoop->exit(true);
+            raiseWarning(tr("Cannot determine device runtime version."));
+            return;
+        }
+
+        BlackBerryVersionNumber apiLevelVersion = BlackBerryVersionNumber::fromNdkEnvFileName(fi.baseName());
+        if (apiLevelVersion.isEmpty()) {
+            // Skip the check if device API level version is not determined
+            m_eventLoop->exit(true);
+            raiseWarning(tr("Cannot determine API level version."));
+            return;
+        }
+
+        bool ok = true;
+        if (apiLevelVersion > deviceRuntimeVersion) {
+            raiseError(tr("The device runtime version (%1) is inferior to the API level version (%2)")
+                       .arg(deviceRuntimeVersion.toString(), apiLevelVersion.toString()));
+
+            QMetaObject::invokeMethod(this, "handleVersionMismatch", Qt::BlockingQueuedConnection,
+                                      Q_RETURN_ARG(bool, ok),
+                                      Q_ARG(QString, deviceRuntimeVersion.toString()),
+                                      Q_ARG(QString, apiLevelVersion.toString()));
+        }
+
+        m_eventLoop->exit(ok);
+        return;
+    }
+
+    m_eventLoop->exit(true);
+}
+
+void BlackBerryCheckDeviceStatusStep::emitOutputInfo()
+{
+    emit addOutput(tr("Checking device status..."), BuildStep::MessageOutput);
+}
+
+void BlackBerryCheckDeviceStatusStep::enableDebugTokenCheck(bool enable)
+{
+    m_debugTokenCheckEnabled = enable;
+}
+
+void BlackBerryCheckDeviceStatusStep::enableRuntimeCheck(bool enable)
+{
+    m_runtimeCheckEnabled = enable;
+}
+
+bool BlackBerryCheckDeviceStatusStep::handleVersionMismatch(const QString &runtimeVersion, const QString &apiLevelVersion)
+{
+    // TODO: Check if a matching API level exists in the user configurations,
+    // otherwise let the user download the matching device runtime.
+    const QMessageBox::StandardButton answer = QMessageBox::question(Core::ICore::mainWindow(), tr("Confirmation"),
+                                                                     tr("The device runtime version(%1) does not match the API level version(%2).\n"
+                                                                        "Do you want to continue anyway?").arg(runtimeVersion, apiLevelVersion),
+                                                                     QMessageBox::Yes | QMessageBox::No);
+    return answer == QMessageBox::Yes;
+}
+
+bool BlackBerryCheckDeviceStatusStep::init()
+{