diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-20 04:28:09 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-06-20 04:28:09 +0000 |
| commit | d1ff9b419da5e3ace68479b02582222486ec9703 (patch) | |
| tree | a978de6c9844cf37bbd7dc5cecc298bf51f4dce3 /doc | |
| parent | 8a4ea3f03807c4d75ef73609dae30cfcf427c3ea (diff) | |
| parent | ce09ef431373f45d14ce0a6e7de24aee3666093d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/global/qt-cpp-defines.qdocconf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index 6c294798e2..4dbe144913 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -239,5 +239,4 @@ excludefiles += \ "*_unix.cpp" \ "*_udev.cpp" \ "*_vxworks.cpp" \ - "*_darwin.cpp" \ - "*_x11.cpp" + "*_darwin.cpp" |