AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65f4924425
qt5base-lts/tests/auto/qsslsocket
History
Samuel Rødal a6b6e760ac Merge remote branch 'gerrit/master' into HEAD 
Conflicts:
	configure.exe
	src/corelib/global/qglobal.h
	src/gui/kernel/qplatformnativeinterface_qpa.h
	src/gui/widgets/qlinecontrol.cpp
	src/gui/widgets/qmenu_mac.mm
	src/gui/widgets/qmenu_p.h
	src/gui/widgets/qmenubar.cpp
	src/gui/widgets/qmenubar_p.h
	src/gui/widgets/widgets.pri
	src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
	src/plugins/platforms/wayland/qwaylandnativeinterface.h
	src/src.pro
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qfileinfo/tst_qfileinfo.cpp
	tests/auto/qsslsocket/tst_qsslsocket.cpp
	tests/auto/qstring/tst_qstring.cpp

Change-Id: I64cf2cefa532ba87a92f632e3595ce6914183e9b
2011-09-06 10:55:40 +02:00
..
certs Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
.gitignore Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
qsslsocket.pro qssl: add auto test to QSsl::Opaque QSslKeys 2011-09-02 09:44:32 +02:00
ssl.tar.gz Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
tst_qsslsocket.cpp Merge remote branch 'gerrit/master' into HEAD 2011-09-06 10:55:40 +02:00