diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-04 12:47:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-04 12:47:04 +0200 |
| commit | 1ace238ce0347857a5ba55d6fa30ba81fed204b9 (patch) | |
| tree | c841b0ff52a306b6b0421d084b3fdbb206badf6b /src/qdoc/tokenizer.cpp | |
| parent | 066affc7c709c8a124a4c031ca2bb5ad3f91e6ff (diff) | |
| parent | 5c50201d616eeefe61b960a8b21d3adbae8c26a0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-alpha1
Change-Id: I82a3e068458fe176ec0e4c441e53a4fa97ae5d4b
Diffstat (limited to 'src/qdoc/tokenizer.cpp')
| -rw-r--r-- | src/qdoc/tokenizer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qdoc/tokenizer.cpp b/src/qdoc/tokenizer.cpp index 3a1003b83..5f4f7cb80 100644 --- a/src/qdoc/tokenizer.cpp +++ b/src/qdoc/tokenizer.cpp @@ -501,7 +501,7 @@ void Tokenizer::initialize(const Config &config) if (!versionSym.isEmpty()) versionX->setPattern("[ \t]*(?:" + QRegExp::escape(versionSym) + ")[ \t]+\"([^\"]*)\"[ \t]*"); - definedX = new QRegExp("defined ?\\(?([A-Z_0-9a-z]+) ?\\)"); + definedX = new QRegExp("defined ?\\(?([A-Z_0-9a-z]+) ?\\)?"); QStringList d = config.getStringList(CONFIG_DEFINES); d += "qdoc"; |