diff options
| author | Jani Heikkinen <jani.heikkinen@digia.com> | 2014-04-23 12:42:48 +0300 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@digia.com> | 2014-04-23 12:42:48 +0300 |
| commit | 54c1e5ed220570034a784bf4c616e177697e4d28 (patch) | |
| tree | 2bac29aabf5380db0cb1f5176525417ac483fd81 /doc | |
| parent | 207598fd8e69be34e8ba2c9db7720cb6003ea114 (diff) | |
| parent | b0d996aed19570da73e9bdc166a38bbb14f4b859 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Id13b4a3803664692f32f9d57549be8a0c4a08567
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/global/qt-cpp-defines.qdocconf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index 3240ec4a20..1039c88e8d 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -19,6 +19,7 @@ defines += Q_QDOC \ Q_COMPILER_RVALUE_REFS Cpp.ignoretokens += \ + ENGINIOCLIENT_EXPORT \ PHONON_EXPORT \ Q_AUTOTEST_EXPORT \ Q_BLUETOOTH_EXPORT \ |