diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-18 09:29:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-20 08:00:26 +0200 |
| commit | e32f1a4d61f0c55d066a43657ad607131be8ca34 (patch) | |
| tree | 81ea388722187e1650b2c2b2d9c22eafae5c0527 /.gitignore | |
| parent | fdb956a3ede6cb0a25112c1e1af6c93fd2051de1 (diff) | |
| parent | ee2eed350f95285b65e3dd9647e5f366e16fd5a4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
And blacklisted a few tests in tst_QUdpSocket.
Conflicts:
src/android/jar/src/org/qtproject/qt5/android/QtNative.java
src/corelib/global/qglobal.cpp
src/corelib/global/qsystemdetection.h
src/corelib/io/qfileselector.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
tests/auto/network/socket/qudpsocket/BLACKLIST
Task-number: QTBUG-54205
Change-Id: I11dd1c90186eb1b847d45be87a26041f61d89ef6
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 7179340e20..1beec5c3ec 100644 --- a/.gitignore +++ b/.gitignore @@ -53,6 +53,7 @@ wrapper.sh wrapper.bat core .qmake.cache +.qmake.stash .qmake.vars .device.vars *.prl @@ -118,6 +119,7 @@ mkspecs/default-host mkspecs/qconfig.pri mkspecs/qdevice.pri mkspecs/qfeatures.pri +mkspecs/qhost.pri moc_*.cpp qmake/qmake.exe qmake/Makefile.bak @@ -203,6 +205,7 @@ tools/qvfb/qwssignalhandler_p.h .rcc *.app config.status +config.tests/common/c++default/c++default.ii config.tests/unix/cups/cups config.tests/unix/getaddrinfo/getaddrinfo config.tests/unix/getifaddrs/getifaddrs |