diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:17:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:17:51 +0200 |
| commit | 79097b48c2f2bd01e51c8953921f0b4f1f52fa6b (patch) | |
| tree | 36034f5ab973eaa2c966c0c6374740b9622d267c /doc/src/platforms/supported-platforms.qdoc | |
| parent | 525546087f2933d110dbb62785789a853ae29552 (diff) | |
| parent | 95b10b280be8120af9802b1c458244a2d775aded (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1
Conflicts:
.qmake.conf
Change-Id: If44eb502c905dca363d5506ae9c5f250287d8279
Diffstat (limited to 'doc/src/platforms/supported-platforms.qdoc')
| -rw-r--r-- | doc/src/platforms/supported-platforms.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc index 7b5fe055e..9abd02faf 100644 --- a/doc/src/platforms/supported-platforms.qdoc +++ b/doc/src/platforms/supported-platforms.qdoc @@ -52,13 +52,13 @@ \l{Qt Platform Abstraction} (QPA), which makes it easier than before to port Qt into a new operating system. + \target Desktop Platforms \section1 Supported Configurations The following table lists configurations supported by The Qt Company. A \e {configuration} is a combination of an operating system version, a compiler version, and a graphics system. - \include supported-platforms.qdocinc latest In the above table, the configurations in \b bold are \e {reference configurations}. |