summaryrefslogtreecommitdiffstats
path: root/tests/manual/bearerex/bearerex.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-04-12 12:56:20 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-12 14:50:39 +0200
commit28675642f3445e41434b004c2a1a1d96ec0145a2 (patch)
tree8a26692b9eba13a416aa16bdc82acc1dc3082e0c /tests/manual/bearerex/bearerex.cpp
parent7ed1ab9076866d39a086fb1d364ab1903afc9a91 (diff)
Build manual tests.
Add a toplevel manual.pro and other .pro-files to build them and fix the build. Change-Id: Ibc98a27b39dd1304edfa8a6894d62e77ce7ef387 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'tests/manual/bearerex/bearerex.cpp')
-rw-r--r--tests/manual/bearerex/bearerex.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/manual/bearerex/bearerex.cpp b/tests/manual/bearerex/bearerex.cpp
index 190be6f6b4..6826312880 100644
--- a/tests/manual/bearerex/bearerex.cpp
+++ b/tests/manual/bearerex/bearerex.cpp
@@ -43,6 +43,7 @@
#include "datatransferer.h"
#include <QtNetwork>
+#include <QtWidgets>
Q_DECLARE_METATYPE(QNetworkConfiguration)
@@ -284,7 +285,7 @@ SessionTab::SessionTab(QNetworkConfiguration* apNetworkConfiguration,
} else if (apNetworkConfiguration->type() == QNetworkConfiguration::ServiceNetwork) {
snapLineEdit->setText(apNetworkConfiguration->name()+" ("+apNetworkConfiguration->identifier()+")");
}
- bearerLineEdit->setText(apNetworkConfiguration->bearerName());
+ bearerLineEdit->setText(apNetworkConfiguration->bearerTypeName());
sentRecDataLineEdit->setText(QString::number(m_NetworkSession->bytesWritten())+
QString(" / ")+
QString::number(m_NetworkSession->bytesReceived()));
@@ -314,8 +315,6 @@ void SessionTab::on_createQNetworkAccessManagerButton_clicked()
m_dataTransferer = new DataTransfererQNam(this);
} else if (type == "QTcpSocket") {
m_dataTransferer = new DataTransfererQTcp(this);
- } else if (type == "QHttp") {
- m_dataTransferer = new DataTransfererQHttp(this);
} else {
qDebug("BearerEx Warning, unknown data transfer object requested, not creating anything.");
return;
@@ -512,10 +511,10 @@ void SessionTab::newState(QNetworkSession::State state)
QNetworkConfiguration config = m_ConfigManager->configurationFromIdentifier(configId);
if (config.isValid()) {
iapLineEdit->setText(config.name()+" ("+config.identifier()+")");
- bearerLineEdit->setText(config.bearerName());
+ bearerLineEdit->setText(config.bearerTypeName());
}
} else {
- bearerLineEdit->setText(m_NetworkSession->configuration().bearerName());
+ bearerLineEdit->setText(m_NetworkSession->configuration().bearerTypeName());
}
QString active;