diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-12 10:55:04 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-12 10:55:47 +0200 |
| commit | 324549636bf4d185d9f4a8405ef2ba75fb3c9c9b (patch) | |
| tree | 00c4b6a3f8322a0474f32da170a1d227f6f1cec5 | |
| parent | 057921868881295c0128204f2f4e53956b0a3d3c (diff) | |
| parent | e0a8b06317bb51ca844818682ebec3cd2c2b5108 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
* origin/5.10:
Merge remote-tracking branch 'origin/5.9' into 5.10
Fix the appearance of network settings
Doc: Bump version to 5.10.1
Doc: Bump version to 5.9.4
Conflicts:
src/settingsui/network/NetworkSettings.qml
Change-Id: I1d65634b3180762bc386d36d222e94372fb418d4
| -rw-r--r-- | .qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index b99d6a9..72d1dfc 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION=5.10.0 +MODULE_VERSION=5.10.1 CMAKE_MODULE_TESTS=- |