Frederik Gladhorn 34aba4724f Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/io/qiodevice.cpp src/plugins/bearer/linux_common/qofonoservice_linux.cpp src/plugins/bearer/linux_common/qofonoservice_linux_p.h src/plugins/platforms/android/qandroidplatformtheme.cpp src/tools/bootstrap/bootstrap.pro src/widgets/styles/qmacstyle_mac.mm Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b		2014-11-24 13:39:13 +01:00
..
certs	…
echo	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
test	QtNetwork tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2014-02-25 16:47:13 +01:00
.gitattributes	…
.gitignore	…
BLACKLIST	fix how qnetworkreply autotests are blacklisted	2014-11-20 14:58:49 +01:00
bigfile	…
empty	…
image1.jpg	…
image2.jpg	…
image3.jpg	…
index.html	…
qnetworkreply.pro	…
qnetworkreply.qrc	…
resource	…
rfc3252.txt	…
smb-file.txt	…
tst_qnetworkreply.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2014-10-09 17:56:52 +02:00