diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-25 15:37:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-25 15:47:42 +0200 |
| commit | aedc59b1c38528f96f0e0cc51bf6c9eeca9dca28 (patch) | |
| tree | 80e38cea91c93736a7d4436642dd46c8b2dd6386 /qmake/generators/win32 | |
| parent | e3b3dbbe93dbbac196543f62b444b2c044d14907 (diff) | |
| parent | f6db25962e820d7709c2f235f02893dd3edde4f4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/corelib/io/qstorageinfo_unix.cpp
src/network/ssl/qsslsocket_openssl.cpp
Change-Id: Ibc9ce799bef62d60d616beaa9fbde8ebeadfbc20
Diffstat (limited to 'qmake/generators/win32')
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index de7363e51b..746f3e9008 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -254,7 +254,7 @@ void MingwMakefileGenerator::init() } if(project->isActiveConfig("dll")) { - project->values("QMAKE_CLEAN").append(project->first("MINGW_IMPORT_LIB")); + project->values("QMAKE_DISTCLEAN").append(project->first("MINGW_IMPORT_LIB")); } } |