#include "datatransferer.h"
#include <QtNetwork>
+#include <QtWidgets>
Q_DECLARE_METATYPE(QNetworkConfiguration)
} 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()));
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;
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;
#ifndef ACCESSPOINTMANAGEREX_H
#define ACCESSPOINTMANAGEREX_H
-#include <QtGui>
+#include <QtWidgets>
#include "ui_detailedinfodialog.h"
QT += core \
gui \
+ widgets \
network
FORMS += detailedinfodialog.ui
emit finished(socketError, 0, "QAbstractSocket::SocketError");
}
-// -------- Based on QHttp
-
-DataTransfererQHttp::DataTransfererQHttp(QObject* parent)
-: DataTransferer(parent)
-{
- connect(&m_qhttp, SIGNAL(done(bool)), this, SLOT(done(bool)));
- qDebug("BearerEx DataTransferer QHttp created.");
-}
-
-DataTransfererQHttp::~DataTransfererQHttp()
-{
- qDebug("BearerEx DataTransferer QHttp destroyed.");
-}
-
-bool DataTransfererQHttp::transferData()
-{
- qDebug("BearerEx datatransfer for QHttp requested.");
- if (m_dataTransferOngoing) {
- return false;
- }
- QString urlstring("http://www.google.com");
- QUrl url(urlstring);
- m_qhttp.setHost(url.host(), QHttp::ConnectionModeHttp, url.port() == -1 ? 0 : url.port());
- m_qhttp.get(urlstring);
- m_dataTransferOngoing = true;
- return true;
-}
-
-void DataTransfererQHttp::done(bool /*error*/ )
-{
- qDebug("BearerEx DatatransfererQHttp reply was finished (error code is type QHttp::Error).");
- qint64 dataReceived = 0;
- quint32 errorCode = m_qhttp.error();
- if (m_qhttp.error() == QHttp::NoError) {
- QString result(m_qhttp.readAll());
- dataReceived = result.length();
- }
- m_dataTransferOngoing = false;
- emit finished(errorCode, dataReceived, "QHttp::Error");
-}
-
// -------- Based on QNetworkAccessManager
DataTransfererQNam::DataTransfererQNam(QObject* parent)
#include <QNetworkReply>
#include <QNetworkAccessManager>
#include <QTcpSocket>
-#include <QHttp>
#include <QDebug>
// Interface-class for data transferring object
QNetworkAccessManager m_qnam;
};
-class DataTransfererQHttp : public DataTransferer
-{
- Q_OBJECT
-public:
- DataTransfererQHttp(QObject* parent = 0);
- ~DataTransfererQHttp();
-
- virtual bool transferData();
-
-public slots:
- void done(bool error);
-
-private:
- QHttp m_qhttp;
-};
-
#endif // DATATRANSFERER_H
#include <QBackingStore>
#include <QPainter>
-#include <QtGui>
+#include <QtWidgets>
static int colorIndexId = 0;
****************************************************************************/
#include <QtCore>
-#include <QtGui>
+#include <QtWidgets>
#include "window.h"
#include <QBackingStore>
#include <QPainter>
-#include <QtGui>
+#include <QtWidgets>
static int colorIndexId = 0;
--- /dev/null
+TEMPLATE=subdirs
+
+SUBDIRS = graphicsview \
+ scrollarea
+QT += widgets
+
SOURCES += main.cpp \
imageitem.cpp \
gestures.cpp \
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
#include "imageitem.h"
#include "gestures.h"
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
#include "mousepangesturerecognizer.h"
+QT += widgets
+
SOURCES = main.cpp \
mousepangesturerecognizer.cpp
HEADERS += mousepangesturerecognizer.h
#ifndef INPUTMETHODHINTS_H
#define INPUTMETHODHINTS_H
-#include <QtGui/QMainWindow>
-#include "ui_tst_inputmethodhints.h"
+#include <QtWidgets/QMainWindow>
+#include "ui_inputmethodhints.h"
class inputmethodhints : public QMainWindow
{
TEMPLATE = app
TARGET = tst_inputmethodhints
-QT += core \
- gui
+QT += widgets
HEADERS += inputmethodhints.h
SOURCES += main.cpp \
#include "inputmethodhints.h"
-#include <QtGui>
+#include <QtWidgets>
#include <QApplication>
int main(int argc, char *argv[])
+QT += widgets
SOURCES += main.cpp
FORMS += keypadnavigation.ui
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
#include "ui_keypadnavigation.h"
class KeypadNavigation : public QMainWindow
**
****************************************************************************/
#include "interactivewidget.h"
-#include <QtGui/QToolBox>
+#include <QtWidgets>
InteractiveWidget::InteractiveWidget()
{
#include "widgets.h"
#include "paintcommands.h"
-#include <QtGui>
+#include <QMainWindow>
#include <private/qmath_p.h>
-LANCELOT_DIR = $$PWD/../../auto/lancelot
+LANCELOT_DIR = $$PWD/../../auto/other/lancelot
CONFIG+=console moc
TEMPLATE = app
INCLUDEPATH += . $$LANCELOT_DIR
-QT += core-private gui-private
+QT += core-private gui-private widgets printsupport
HEADERS += widgets.h \
interactivewidget.h \
#include "paintcommands.h"
#include <QtCore>
-#include <QtGui>
+#include <QtWidgets>
+#include <QtPrintSupport>
#include <qimage.h>
#include <QPicture>
pcmd.setType(type);
pcmd.setCheckersBackground(checkers_background);
pcmd.setContents(content);
- bool ps = type == PsType;
QPrinter p(highres ? QPrinter::HighResolution : QPrinter::ScreenResolution);
QFileInfo input(files.at(j));
- QString file = QString("%1_%2.%3")
- .arg(input.baseName())
- .arg(input.suffix())
- .arg(ps ? "ps" : "pdf");
- p.setOutputFormat(ps ? QPrinter::PdfFormat : QPrinter::PostScriptFormat);
+ const QString file = input.baseName() + QLatin1Char('_')
+ + input.suffix() + QStringLiteral(".pdf");
+ p.setOutputFormat(QPrinter::PdfFormat);
p.setOutputFileName(file);
p.setPageSize(QPrinter::A4);
QPainter pt(&p);
#include <QSignalMapper>
#include <QAction>
-
-#include <private/qwindowsurface_p.h>
-
#include <qmath.h>
const int CP_RADIUS = 10;
}
if (m_render_view.isNull()) {
-
- if (T::window()->windowSurface())
- m_render_view = T::window()->windowSurface()->grabWidget(this);
- else
- m_render_view = QPixmap::grabWidget(this);
-
+ m_render_view = QPixmap::grabWidget(this);
m_render_view.save("renderView.png");
}
}
--- /dev/null
+TEMPLATE=subdirs
+
+SUBDIRS = bearerex \
+gestures \
+inputmethodhints \
+keypadnavigation \
+lance \
+network_remote_stresstest \
+network_stresstest \
+qcursor \
+qdesktopwidget \
+qgraphicsitemgroup \
+qgraphicslayout/flicker \
+qhttpnetworkconnection \
+qimagereader \
+qlocale \
+qnetworkaccessmanager/qget \
+qnetworkconfigurationmanager \
+qnetworkreply \
+qssloptions \
+qtabletevent \
+qtbug-8933 \
+qtouchevent \
+qwidget_zorder \
+repaint \
+socketengine \
+textrendering \
+widgets/itemviews/delegate \
+windowflags \
+windowmodality
+
+!contains(QT_CONFIG, openssl):!contains(QT_CONFIG, openssl-linked):SUBDIRS -= qssloptions
CONFIG += testcase
TARGET = tst_network_remote_stresstest
-QT = core network testlib
+QT = core core-private network network-private testlib
SOURCES += tst_network_remote_stresstest.cpp
RESOURCES += url-list.qrc
+LIBS += $$QMAKE_LIBS_NETWORK
QElapsedTimer outerTimer;
outerTimer.start();
+#ifdef QT_NO_SSL
+ QVERIFY(!useSslSocket);
+#endif // QT_NO_SSL
+
for (int i = 0; i < urlList.size(); ++i) {
const QUrl &url = urlList.at(i);
bool isHttps = url.scheme() == "https";
timeout.start();
QSharedPointer<QTcpSocket> socket;
- if (useSslSocket || isHttps) {
+#ifndef QT_NO_SSL
+ if (useSslSocket || isHttps)
socket = QSharedPointer<QTcpSocket>(new QSslSocket);
- } else {
+#endif // QT_NO_SSL
+ if (socket.isNull())
socket = QSharedPointer<QTcpSocket>(new QTcpSocket);
- }
socket->connectToHost(url.host(), url.port(isHttps ? 443 : 80));
QVERIFY2(socket->waitForConnected(10000), "Timeout connecting to " + url.encodedHost());
+#ifndef QT_NO_SSL
if (isHttps) {
static_cast<QSslSocket *>(socket.data())->setProtocol(QSsl::TlsV1_0);
static_cast<QSslSocket *>(socket.data())->startClientEncryption();
static_cast<QSslSocket *>(socket.data())->ignoreSslErrors();
QVERIFY2(static_cast<QSslSocket *>(socket.data())->waitForEncrypted(10000), "Timeout starting TLS with " + url.encodedHost());
}
+#endif // QT_NO_SSL
socket->write("GET " + url.toEncoded(QUrl::RemoveScheme | QUrl::RemoveAuthority | QUrl::RemoveFragment) + " HTTP/1.0\r\n"
"Connection: close\r\n"
QFETCH_GLOBAL(QVector<QUrl>, urlList);
QFETCH_GLOBAL(bool, useSslSocket);
+#ifdef QT_NO_SSL
+ QVERIFY(!useSslSocket);
+#endif // QT_NO_SSL
+
qint64 totalBytes = 0;
QElapsedTimer outerTimer;
outerTimer.start();
timeout.start();
QSharedPointer<QTcpSocket> socket;
- if (useSslSocket || isHttps) {
+#ifndef QT_NO_SSL
+ if (useSslSocket || isHttps)
socket = QSharedPointer<QTcpSocket>(new QSslSocket);
- } else {
+#endif // QT_NO_SSL
+ if (socket.isNull())
socket = QSharedPointer<QTcpSocket>(new QTcpSocket);
- }
if (isHttps) {
+#ifndef QT_NO_SSL
static_cast<QSslSocket *>(socket.data())->setProtocol(QSsl::TlsV1_0);
static_cast<QSslSocket *>(socket.data())->connectToHostEncrypted(url.host(), url.port(443));
static_cast<QSslSocket *>(socket.data())->ignoreSslErrors();
+#endif // QT_NO_SSL
} else {
socket->connectToHost(url.host(), url.port(80));
}
QFETCH(int, parallelAttempts);
+#ifdef QT_NO_SSL
+ QVERIFY(!useSslSocket);
+#endif // QT_NO_SSL
+
qint64 totalBytes = 0;
QElapsedTimer outerTimer;
outerTimer.start();
for (int j = 0; j < parallelAttempts && it != urlList.constEnd(); ++j, ++it) {
const QUrl &url = *it;
bool isHttps = url.scheme() == "https";
- QTcpSocket *socket;
+ QTcpSocket *socket = 0;
+#ifndef QT_NO_SSL
if (useSslSocket || isHttps)
socket = new QSslSocket;
- else
+#endif // QT_NO_SSL
+ if (!socket)
socket = new QTcpSocket;
if (isHttps) {
+#ifndef QT_NO_SSL
static_cast<QSslSocket *>(socket)->setProtocol(QSsl::TlsV1_0);
static_cast<QSslSocket *>(socket)->connectToHostEncrypted(url.host(), url.port(443));
static_cast<QSslSocket *>(socket)->ignoreSslErrors();
+#endif // QT_NO_SSL
} else {
socket->connectToHost(url.host(), url.port(isHttps ? 443 : 80));
}
CONFIG += testcase
TARGET = tst_network_stresstest
-QT = core network testlib
+QT = core-private network-private testlib
SOURCES += tst_network_stresstest.cpp \
minihttpserver.cpp
RESOURCES += wwwfiles.qrc
QMAKE_RESOURCE_FLAGS += -no-compress
+LIBS += $$QMAKE_LIBS_NETWORK
QVERIFY(fd != INVALID_SOCKET);
// set the socket to non-blocking and start connecting
- unsigned long buf = v;
+ unsigned long buf = 0;
unsigned long outBuf;
DWORD sizeWritten = 0;
QVERIFY(::WSAIoctl(fd, FIONBIO, &buf, sizeof(unsigned long), &outBuf, sizeof(unsigned long), &sizeWritten, 0,0) != SOCKET_ERROR);
while (true) {
- int connectResult = ::WSAConnect(fd, sockAddrPtr, sockAddrSize, 0,0,0,0);
+ int connectResult = ::WSAConnect(fd, (sockaddr *)addr.data(), addr.size(), 0,0,0,0);
if (connectResult == 0 || WSAGetLastError() == WSAEISCONN) {
break; // connected
} else {
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
class DesktopView : public QGraphicsView
{
TEMPLATE = app
+QT += widgets
SOURCES += main.cpp
**
****************************************************************************/
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
#include "widget.h"
int main(int argc, char *argv[])
TARGET = qgraphicsitemgroup
+QT += widgets
TEMPLATE = app
SOURCES += main.cpp \
widget.cpp \
+QT += widgets
HEADERS += window.h
SOURCES += main.cpp window.cpp
**
****************************************************************************/
-#include <QtGui>
-#include <windows.h>
+#include <QtWidgets>
#include "window.h"
int main(int argc, char **argv)
#define WINDOW_H
-#include <QtGui>
+#include <QtWidgets>
struct Statistics {
Statistics() : output(0),
QT -= gui
QT += network testlib
-CONFIG += release
-
SOURCES += main.cpp
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
class MyWidget : public QWidget
{
+QT += widgets
SOURCES += main.cpp
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
#include "calendar.h"
#ifndef CALENDAR_H
#define CALENDAR_H
-#include <QtGui>
+#include <QtWidgets>
class CalendarWidget : public QWidget
{
#ifndef CURRENCY_H
#define CURRENCY_H
-#include <QtGui>
+#include <QtWidgets>
class CurrencyWidget : public QWidget
{
#ifndef DATEFORMATS_H
#define DATEFORMATS_H
-#include <QtGui>
+#include <QtWidgets>
class DateFormatsWidget : public QWidget
{
#ifndef INFO_H
#define INFO_H
-#include <QtGui>
+#include <QtWidgets>
class InfoWidget : public QWidget
{
#ifndef LANGUAGES_H
#define LANGUAGES_H
-#include <QtGui>
+#include <QtWidgets>
class LanguagesWidget : public QWidget
{
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
#include "window.h"
#ifndef MISCELLANEOUS_H
#define MISCELLANEOUS_H
-#include <QtGui>
+#include <QtWidgets>
class MiscWidget : public QWidget
{
#ifndef NUMBERFORMATS_H
#define NUMBERFORMATS_H
-#include <QtGui>
+#include <QtWidgets>
class NumberFormatsWidget : public QWidget
{
+QT += widgets
HEADERS += currency.h calendar.h dateformats.h numberformats.h languages.h window.h miscellaneous.h info.h
SOURCES += currency.cpp main.cpp calendar.cpp dateformats.cpp numberformats.cpp languages.cpp window.cpp miscellaneous.cpp info.cpp
#ifndef WINDOW_H
#define WINDOW_H
-#include <QtGui>
+#include <QtWidgets>
#include "calendar.h"
#include "currency.h"
void finished(QNetworkReply *reply);
void authenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator);
void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator);
+#ifndef QT_NO_SSL
void sslErrors(QNetworkReply *reply, const QList<QSslError> &errors);
+#endif
void downloadFinished(TransferItem *item);
private:
TransferItem *findTransfer(QNetworkReply *reply);
QT -= gui
QT += network testlib
-CONFIG += release
-
SOURCES += main.cpp
QT -= gui
QT += network testlib
-CONFIG += release
-
SOURCES += main.cpp
+QT += widgets
SOURCES += \
main.cpp \
tabletwidget.cpp
**
****************************************************************************/
-#include <QtGui>
+#include <QApplication>
#include "tabletwidget.h"
int main(int argc, char **argv) {
-QT += testlib
+QT += widgets testlib
SOURCES += main.cpp \
mousestatwidget.cpp
--- /dev/null
+TEMPLATE=subdirs
+
+SUBDIRS = device_information \
+ event_compression \
+ regular_widgets
TEMPLATE = app
+QT += widgets
SOURCES += main.cpp
**
****************************************************************************/
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
#include "widget.h"
int main(int argc, char *argv[])
TARGET = qtbug-8933
TEMPLATE = app
-
+QT += widgets
SOURCES += main.cpp\
widget.cpp
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
#include <QtTest>
#include "ui_form.h"
-QT += testlib
+QT += widgets testlib
SOURCES = main.cpp \
touchwidget.cpp
FORMS += form.ui
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
class Widget : public QWidget
{
+QT += widgets
SOURCES += main.cpp
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
#include "../shared/shared.h"
int main(int argc, char **argv)
+QT += widgets
HEADERS += ../shared/shared.h
SOURCES += main.cpp
--- /dev/null
+TEMPLATE=subdirs
+
+SUBDIRS = mainwindow \
+ scrollarea \
+ splitter \
+ tableview \
+ task141091 \
+ toplevel \
+ widget
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
#include "../shared/shared.h"
+QT += widgets
HEADERS += ../shared/shared.h
SOURCES += main.cpp
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
class StaticWidget : public QWidget
{
Q_OBJECT
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
#include "../shared/shared.h"
int main(int argc, char **argv)
+QT += widgets
HEADERS += ../shared/shared.h
SOURCES += main.cpp
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
#include "../shared/shared.h"
class CellWidget : public QWidget
+QT += widgets
HEADERS +=../shared/shared.h
SOURCES += main.cpp
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
#include <QDebug>
class MyWidget : public QWidget
CONFIG += console
-
+QT += widgets
SOURCES += main.cpp
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
#include "../shared/shared.h"
int main(int argc, char **argv)
CONFIG += console
+QT += widgets
HEADERS += ../shared/shared.h
SOURCES += main.cpp
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
#include "../shared/shared.h"
class Child : public StaticWidget
+QT += widgets
HEADERS += ../shared/shared.h
SOURCES += main.cpp
#include <QDebug>
#include <private/qabstractsocketengine_p.h>
#include <cstdio>
-#include <strings.h>
#include <QNetworkConfigurationManager>
#include <QNetworkConfiguration>
#include <QNetworkSession>
// disconnected
exit(0);
}
- bzero(buf, bufsize);
+ qFill(buf, buf + bufsize, 0);
ret = socketEngine->read(buf, available);
if (ret > 0) {
printf("%s", buf);
TARGET = tst_socketengine
QT -= gui
-QT += network testlib
-
-CONFIG += release
+QT += network-private core-private testlib
SOURCES += main.cpp
+QT += widgets
SOURCES = main.cpp
OTHER_FILES = glyphshaping_data.xml
glyphshaping_data.path = .
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
static const int fontPixelSize = 25;
static const QLatin1String fontFamily("Series 60 Sans");
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets>
static const int lastMeasurementsCount = 50;
+QT += widgets
SOURCES = main.cpp
--- /dev/null
+TEMPLATE=subdirs
+
+SUBDIRS = glyphshaping \
+ textperformance
TEMPLATE = app
+QT += widgets
SOURCES=example.cpp
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QHBoxLayout>
#include "controllerwindow.h"
mainLayout->addLayout(bottomLayout);
setLayout(mainLayout);
- setWindowTitle(tr("Window Flags"));
+ setWindowTitle(tr("Window Flags (Qt version %1, %2)")
+ .arg(QLatin1String(qVersion()), qApp->platformName()));
updatePreview();
}
**
****************************************************************************/
-#include <QtGui>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QVBoxLayout>
#include "previewwindow.h"
+QT += widgets
+
HEADERS = controllerwindow.h \
previewwindow.h
SOURCES = controllerwindow.cpp \
projects / profile / ivi / qtbase.git / commitdiff