diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-05 13:32:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-05 13:37:21 +0100 |
| commit | 53b141dcebc2ca423dbc31e5b6321a769155e9a4 (patch) | |
| tree | e62c7d9875acab8094d64d137c90e7e5f53c0893 /mkspecs/win32-g++ | |
| parent | 2c6c044500a92a3a125ce4b5d936992bdf02a487 (diff) | |
| parent | 6508fdca1dcc7105947befadba272d0fd4bbc27f (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/plugins/platforms/ios/quiview.mm
Change-Id: I88384c70047391c75d9ff166c8d9881ff6751dbf
Diffstat (limited to 'mkspecs/win32-g++')
| -rw-r--r-- | mkspecs/win32-g++/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 884286ea30..36ec1c5c78 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -1,7 +1,7 @@ # # qmake configuration for win32-g++ # -# Written for MinGW / gcc 4.6 or higher +# Written for MinGW-w64 / gcc 5.3 or higher # # Cross compile example for i686-w64-mingw32-g++: # configure -xplatform win32-g++ -device-option CROSS_COMPILE=i686-w64-mingw32- |