diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-03 15:32:50 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-03 15:32:50 +0200 |
| commit | d9016e9a3fe18cc0adf767d020ad33c5cd515274 (patch) | |
| tree | 6e6d7ed1ff8633ae34516f8f016004cb3caea478 | |
| parent | a3190387ab37849cd5ded6fcf350afca8cd17246 (diff) | |
| parent | 51d96c15d918fbcdc503ef36268e2cdb5011b1ce (diff) | |
| download | qttools-d9016e9a3fe18cc0adf767d020ad33c5cd515274.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
| -rw-r--r-- | src/designer/src/designer/doc/snippets/uitools/calculatorform/main.cpp | 6 | ||||
| -rw-r--r-- | src/qdoc/clangcodeparser.cpp | 15 | ||||
| -rw-r--r-- | src/qdoc/htmlgenerator.cpp | 7 | ||||
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/parseqrc/project.pro | 2 |
4 files changed, 20 insertions, 10 deletions
diff --git a/src/designer/src/designer/doc/snippets/uitools/calculatorform/main.cpp b/src/designer/src/designer/doc/snippets/uitools/calculatorform/main.cpp index d13c530ae..e34c812a3 100644 --- a/src/designer/src/designer/doc/snippets/uitools/calculatorform/main.cpp +++ b/src/designer/src/designer/doc/snippets/uitools/calculatorform/main.cpp @@ -57,11 +57,11 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - QWidget *widget = new QWidget; + QWidget widget; Ui::CalculatorForm ui; - ui.setupUi(widget); + ui.setupUi(&widget); - widget->show(); + widget.show(); return app.exec(); } //! [1] diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp index 5bda5296b..add84b9a9 100644 --- a/src/qdoc/clangcodeparser.cpp +++ b/src/qdoc/clangcodeparser.cpp @@ -1021,8 +1021,19 @@ void ClangCodeParser::initializeParser(const Config &config) printParsingErrors_ = 1; version_ = config.getString(CONFIG_VERSION); const auto args = config.getStringList(CONFIG_INCLUDEPATHS); - includePaths_.resize(args.size()); - std::transform(args.begin(), args.end(), includePaths_.begin(), + QStringList squeezedArgs; + int i = 0; + while (i < args.size()) { + if (args.at(i) != QLatin1String("-I")) { + if (args.at(i).startsWith(QLatin1String("-I"))) + squeezedArgs << args.at(i); + else + squeezedArgs << QLatin1String("-I") + args.at(i); + } + i++; + } + includePaths_.resize(squeezedArgs.size()); + std::transform(squeezedArgs.begin(), squeezedArgs.end(), includePaths_.begin(), [](const QString &s) { return s.toUtf8(); }); CppCodeParser::initializeParser(config); pchFileDir_.reset(nullptr); diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index 7bdb0e6e6..61df39156 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -1204,11 +1204,8 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark break; case Atom::SectionHeadingLeft: { int unit = atom->string().toInt() + hOffset(relative); - out() << "<h" + QString::number(unit) + QLatin1Char(' '); - if (unit < 3) { - out() << "id=\"" << Doc::canonicalTitle(Text::sectionHeading(atom).toString()) << "\""; - } - out() << '>'; + out() << "<h" + QString::number(unit) + QLatin1Char(' ') + << "id=\"" << Doc::canonicalTitle(Text::sectionHeading(atom).toString()) << "\">"; inSectionHeading_ = true; break; } diff --git a/tests/auto/linguist/lupdate/testdata/good/parseqrc/project.pro b/tests/auto/linguist/lupdate/testdata/good/parseqrc/project.pro index 5000c7396..0dbc9e9d0 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parseqrc/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/parseqrc/project.pro @@ -5,3 +5,5 @@ RESOURCES += project.qrc RESOURCES += main.qml TRANSLATIONS = project.ts + +CONFIG += qtquickcompiler |