diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-03-23 16:06:00 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-03-23 16:06:25 +0100 |
| commit | 2f0e30c15030098bd13342081249509bc45405ea (patch) | |
| tree | 8ad88b5c66a182dc5efd4e10c05a3ca821969322 /src/libs/cplusplus/SimpleLexer.cpp | |
| parent | 32a056aee05b23dfa2052296b8607a5d033a9c26 (diff) | |
| download | qt-creator-2f0e30c15030098bd13342081249509bc45405ea.tar.gz | |
Fixed #import completion to act the same as #include completion.
Diffstat (limited to 'src/libs/cplusplus/SimpleLexer.cpp')
| -rw-r--r-- | src/libs/cplusplus/SimpleLexer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libs/cplusplus/SimpleLexer.cpp b/src/libs/cplusplus/SimpleLexer.cpp index 0dd83585c4..94be633147 100644 --- a/src/libs/cplusplus/SimpleLexer.cpp +++ b/src/libs/cplusplus/SimpleLexer.cpp @@ -156,6 +156,10 @@ QList<SimpleToken> SimpleLexer::operator()(const QString &text, int state) else if (inPreproc && tokens.size() == 1 && simpleTk.is(T_IDENTIFIER) && simpleTk.text() == QLatin1String("include")) lex.setScanAngleStringLiteralTokens(true); + else if (_objCEnabled + && inPreproc && tokens.size() == 1 && simpleTk.is(T_IDENTIFIER) && + simpleTk.text() == QLatin1String("import")) + lex.setScanAngleStringLiteralTokens(true); if (_objCEnabled && tk.is(T_IDENTIFIER)) simpleTk.f._objcTypeQualifier = (classifyObjectiveCContextKeyword(firstChar + tk.offset, tk.f.length) != Token_identifier); |