diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-12-15 12:21:49 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-12-15 12:21:58 +0100 |
commit | ff60bf37c97b1ce398a7f8623ea108a2b4a1b313 (patch) | |
tree | 8a0af8ef7ac90863cc2f02a5dc20df5896ce3fdd /doc | |
parent | 75cfa50771323f7a2253888d651ff2b5cb36f16c (diff) | |
parent | aa6fb0da41b51d82c13a35680762f5346c75bda9 (diff) | |
download | qt-creator-ff60bf37c97b1ce398a7f8623ea108a2b4a1b313.tar.gz |
Merge remote-tracking branch 'origin/3.6'
Change-Id: I8223551aec66539dd8c55262e5000c1621410334
Diffstat (limited to 'doc')
-rw-r--r-- | doc/config/qt-defines.qdocconf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/config/qt-defines.qdocconf b/doc/config/qt-defines.qdocconf index c40ccba5ca..cde37a1c03 100644 --- a/doc/config/qt-defines.qdocconf +++ b/doc/config/qt-defines.qdocconf @@ -14,5 +14,3 @@ defines = Q_QDOC \ $QTC_LICENSE_TYPE versionsym = QT_VERSION_STR - -codeindent = 1 |