summaryrefslogtreecommitdiff
path: root/.qmake.conf
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-19 03:03:44 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-19 03:03:44 +0100
commit435f478a3e80d9ed17691c85e584d7fc6a71c3b7 (patch)
tree56e6dc7fcbcd76d568a2bcc919c81fcb88fb1cdb /.qmake.conf
parent1129934e9648e6f770272b7c3bbcd88380d424e2 (diff)
parentfe04f2bc8deabcd8fdf5b8c408b23bc3ce071e6d (diff)
downloadqtlocation-435f478a3e80d9ed17691c85e584d7fc6a71c3b7.tar.gz
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I2d19d8340a70760e8d545582fd7c966263e958bd
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions