Merge app_version.h and ide_version.h

Change-Id: I703d4704a3bdf88bd567c92512ee27db6aea043c
Reviewed-on: http://codereview.qt.nokia.com/3918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
This commit is contained in:
Eike Ziller
2011-08-30 15:57:00 +02:00
committed by Daniel Molkentin
parent b6835eaa80
commit bbfa7e0020
19 changed files with 71 additions and 109 deletions

View File

@@ -40,7 +40,7 @@
#include <sys/utsname.h>
#endif
#include "app_version.h"
#include <app/app_version.h>
/*!
\class Utils::NetworkManager
@@ -134,7 +134,7 @@ 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(APP_VERSION_STR).arg(qVersion())
.arg(Core::Constants::IDE_VERSION_LONG).arg(qVersion())
.arg(getOsString()).arg(QLocale::system().name())
.arg(QSysInfo::WordSize);
QNetworkRequest req(request);