diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:34:32 -0700 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:36:10 -0700 |
| commit | d38fe875c7850ca2c6ca28f91e94ae276735fac8 (patch) | |
| tree | e5c92cef74e0853490d77cf0139b23f00d548a6e /config.tests/unix/mremap/mremap.pro | |
| parent | ac4e848c9802377b7c4ff673180f28b9ca76b746 (diff) | |
| parent | 627f0a7f7d775ecd263b95dd07fca44bfcb0c5cf (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmainwindowlayout.cpp
Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6
Diffstat (limited to 'config.tests/unix/mremap/mremap.pro')
| -rw-r--r-- | config.tests/unix/mremap/mremap.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config.tests/unix/mremap/mremap.pro b/config.tests/unix/mremap/mremap.pro deleted file mode 100644 index 1dbd3b7a7e..0000000000 --- a/config.tests/unix/mremap/mremap.pro +++ /dev/null @@ -1,2 +0,0 @@ -SOURCES = mremap.cpp -CONFIG -= qt dylib |