diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-12-29 15:56:33 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-12-30 12:09:53 +0100 |
| commit | db92f2f3aac60218756a1aa8811cf192acc0b0e6 (patch) | |
| tree | f28a47aebb2f08e221fe7bffafce62a0a96cf7fd /src/corelib/io/qstandardpaths_win.cpp | |
| parent | dd61a1d98ea9fbffeaf0e2adcd0ddd58105f6a75 (diff) | |
| parent | 44da5b863597e761df3545dc7ff02a9b53bbb13d (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
mkspecs/win32-g++/qmake.conf
src/corelib/global/qglobal_p.h
src/corelib/global/qoperatingsystemversion_p.h
src/corelib/io/qfilesystemengine_win.cpp
src/network/bearer/qbearerengine.cpp
src/platformsupport/input/libinput/qlibinputpointer.cpp
src/sql/doc/snippets/code/doc_src_sql-driver.cpp
src/widgets/kernel/qwidget_p.h
src/widgets/kernel/qwidgetwindow.cpp
src/widgets/styles/qfusionstyle.cpp
tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
Change-Id: I80e2722f481b12fff5d967c28f89208c0e9a1dd8
Diffstat (limited to 'src/corelib/io/qstandardpaths_win.cpp')
0 files changed, 0 insertions, 0 deletions