feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Instead use QCoreApplication abstractions.

Change-Id: Ic349e0d2c4bb001815c81ba191c941a31c5b11ca
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Kai Koehne
2012-09-11 14:14:21 +02:00
committed by Eike Ziller
parent 5ac721dd58
commit 772b740df8
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/utils/networkaccessmanager.cpp
View File

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

7
src/libs/utils/persistentsettings.cpp
View File

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