summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus/CppDocument.cpp
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2011-01-10 14:39:12 +0100
committerChristian Kamm <christian.d.kamm@nokia.com>2011-01-10 14:40:40 +0100
commitd3c1dd6a09417450d2bac82138097e7714550eb1 (patch)
tree925d6108c891c185a69633c26f3d254287813ab8 /src/libs/cplusplus/CppDocument.cpp
parent549022b55fb40c365e4791299eb873a350a70cad (diff)
downloadqt-creator-d3c1dd6a09417450d2bac82138097e7714550eb1.tar.gz
C++/Qml: Don't allow exported types to override builtins.
There was trouble when a plugin qmlRegisterType'd something like 'Item' into the global default module. Reviewed-by: Roberto Raggi
Diffstat (limited to 'src/libs/cplusplus/CppDocument.cpp')
-rw-r--r--src/libs/cplusplus/CppDocument.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp
index 8bb682ed4e..f5f5a5b20e 100644
--- a/src/libs/cplusplus/CppDocument.cpp
+++ b/src/libs/cplusplus/CppDocument.cpp
@@ -701,8 +701,8 @@ protected:
exportedType.minorVersion = QString::fromUtf8(minorLit->chars(), minorLit->size()).toInt();
} else {
translationUnit()->warning(ast->base_expression->firstToken(),
- "The package will only be available in Qt Creator's QML editors when the package name is a string literal and\n"
- "the versions are integer literals. The type will be available globally.");
+ "The module will not be available in Qt Creator's QML editors because the uri and version numbers\n"
+ "cannot be determined by static analysis. The type will still be available globally.");
exportedType.packageName = QLatin1String("<default>");
}