diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
| commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
| tree | 9981f274712c098cabbff0c4667672a3934e5393 /examples/network/securesocketclient | |
| parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
| parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) | |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'examples/network/securesocketclient')
4 files changed, 6 insertions, 6 deletions
diff --git a/examples/network/securesocketclient/certificateinfo.h b/examples/network/securesocketclient/certificateinfo.h index 6e60ade4f0..cc5cc34e8a 100644 --- a/examples/network/securesocketclient/certificateinfo.h +++ b/examples/network/securesocketclient/certificateinfo.h @@ -41,7 +41,7 @@ #ifndef CERTIFICATEINFO_H #define CERTIFICATEINFO_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> #include <QtNetwork/QSslCertificate> QT_BEGIN_NAMESPACE diff --git a/examples/network/securesocketclient/securesocketclient.pro b/examples/network/securesocketclient/securesocketclient.pro index ae4b15ffbe..94c01cd757 100644 --- a/examples/network/securesocketclient/securesocketclient.pro +++ b/examples/network/securesocketclient/securesocketclient.pro @@ -7,7 +7,7 @@ RESOURCES += securesocketclient.qrc FORMS += certificateinfo.ui \ sslclient.ui \ sslerrors.ui -QT += network +QT += network widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/securesocketclient diff --git a/examples/network/securesocketclient/sslclient.cpp b/examples/network/securesocketclient/sslclient.cpp index 11e6ffd537..9d6af86813 100644 --- a/examples/network/securesocketclient/sslclient.cpp +++ b/examples/network/securesocketclient/sslclient.cpp @@ -43,9 +43,9 @@ #include "ui_sslclient.h" #include "ui_sslerrors.h" -#include <QtGui/QScrollBar> -#include <QtGui/QStyle> -#include <QtGui/QToolButton> +#include <QtWidgets/QScrollBar> +#include <QtWidgets/QStyle> +#include <QtWidgets/QToolButton> #include <QtNetwork/QSslCipher> SslClient::SslClient(QWidget *parent) diff --git a/examples/network/securesocketclient/sslclient.h b/examples/network/securesocketclient/sslclient.h index 33a9a882b6..4e0bc1891f 100644 --- a/examples/network/securesocketclient/sslclient.h +++ b/examples/network/securesocketclient/sslclient.h @@ -41,7 +41,7 @@ #ifndef SSLCLIENT_H #define SSLCLIENT_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QtNetwork/QAbstractSocket> #include <QtNetwork/QSslSocket> |