diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-28 15:29:27 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-28 15:29:27 +0200 |
| commit | dc3efce3dfc668f65fad3486ac689ceb4870ce09 (patch) | |
| tree | fe0ca3a787f2da0ae07371290538180f0c7f8b8d /generator | |
| parent | 54cc52d16ccd0c6350823a1cfcc0154c1a1f543b (diff) | |
| parent | 73ba1c3442dc7bb14a71183a98f6a08f9600f4e9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I91104b0228146de235e1bdb879d016358da4c19a
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/shiboken2/cppgenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/generator/shiboken2/cppgenerator.cpp b/generator/shiboken2/cppgenerator.cpp index df2fd4a..f8b90af 100644 --- a/generator/shiboken2/cppgenerator.cpp +++ b/generator/shiboken2/cppgenerator.cpp @@ -266,7 +266,7 @@ void CppGenerator::generateClass(QTextStream &s, GeneratorContext &classContext) s << endl << "// main header" << endl << "#include \"" << headerfile << '"' << endl; // PYSIDE-500: Use also includes for inherited wrapper classes, because - // with the protected hack, we sometimes need to cast inherited wrappers. + // without the protected hack, we sometimes need to cast inherited wrappers. s << endl << "// inherited wrapper classes" << endl; AbstractMetaClass *basis = metaClass->baseClass(); for (; basis; basis = basis->baseClass()) { |