Utils: Don't depend on app/app_version.h

Instead use QCoreApplication abstractions.

Change-Id: Ic349e0d2c4bb001815c81ba191c941a31c5b11ca
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

src/libs/utils/networkaccessmanager.cpp

@@ -30,6 +30,7 @@
 
 #include "networkaccessmanager.h"
 
+#include <QCoreApplication>
 #include <QLocale>
 #include <QUrl>
 #include <QNetworkReply>
@@ -38,8 +39,6 @@
 #include <sys/utsname.h>
 #endif
 
-#include <app/app_version.h>
-
 /*!
    \class Utils::NetworkManager
 
@@ -131,8 +130,9 @@ void NetworkAccessManager::getUrl(const QUrl &url)
 
 QNetworkReply* NetworkAccessManager::createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData)
 {
-    QString agentStr = QString::fromLatin1("Qt-Creator/%1 (QNetworkAccessManager %2; %3; %4; %5 bit)")
-                    .arg(QLatin1String(Core::Constants::IDE_VERSION_LONG),
+    QString agentStr = QString::fromLatin1("%1/%2 (QNetworkAccessManager %3; %4; %5; %6 bit)")
+                    .arg(QCoreApplication::applicationName(),
+                         QCoreApplication::applicationVersion(),
                          QLatin1String(qVersion()),
                          getOsString(), QLocale::system().name())
                     .arg(QSysInfo::WordSize);

src/libs/utils/persistentsettings.cpp

@@ -30,8 +30,6 @@
 
 #include "persistentsettings.h"
 
-#include <app/app_version.h>
-
 #include <utils/fileutils.h>
 
 #include <QDebug>
@@ -391,8 +389,9 @@ bool PersistentSettingsWriter::save(const QVariantMap &data, QWidget *parent) co
         w.setAutoFormattingIndent(1); // Historical, used to be QDom.
         w.writeStartDocument();
         w.writeDTD(QLatin1String("<!DOCTYPE ") + m_docType + QLatin1Char('>'));
-        w.writeComment(QString::fromAscii(" Written by Qt Creator %1, %2. ").
-                       arg(QLatin1String(Core::Constants::IDE_VERSION_LONG),
+        w.writeComment(QString::fromAscii(" Written by %1 %2, %3. ").
+                       arg(QCoreApplication::applicationName(),
+                           QCoreApplication::applicationVersion(),
                            QDateTime::currentDateTime().toString(Qt::ISODate)));
         w.writeStartElement(ctx.qtCreatorElement);
         const QVariantMap::const_iterator cend = data.constEnd();