From c2f52e97e4811795dd597793bff1034002bc123a Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Tue, 12 Feb 2013 12:19:54 +0100 Subject: [PATCH] qmljs: fix compilation for qt4 QStringList::join only accepts strings, not chars in qt4 Change-Id: I8ad89420d618904e53d0bb08bb1c497995a744c4 Reviewed-by: Thomas Hartmann --- src/plugins/qmljseditor/qmljshoverhandler.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp index 5910497e43c..08c808a426c 100644 --- a/src/plugins/qmljseditor/qmljshoverhandler.cpp +++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp @@ -151,13 +151,13 @@ bool HoverHandler::setQmlTypeHelp(const ScopeChain &scopeChain, const Document:: QStringList helpIdPieces(qName); helpIdPieces.prepend(moduleName); helpIdPieces.prepend(QLatin1String("QML")); - helpId = helpIdPieces.join(QLatin1Char('.')); + helpId = helpIdPieces.join(QLatin1String(".")); if (!Core::HelpManager::instance()->linksForIdentifier(helpId).isEmpty()) break; if (helpIdPieces.size() > 3) { QString lm = helpIdPieces.value(2); helpIdPieces.removeAt(2); - helpId = helpIdPieces.join(QLatin1Char('.')); + helpId = helpIdPieces.join(QLatin1String(".")); if (!Core::HelpManager::instance()->linksForIdentifier(helpId).isEmpty()) break; helpIdPieces.replace(1, lm); @@ -165,12 +165,12 @@ bool HoverHandler::setQmlTypeHelp(const ScopeChain &scopeChain, const Document:: break; } helpIdPieces.removeAt(1); - helpId = helpIdPieces.join(QLatin1Char('.')); + helpId = helpIdPieces.join(QLatin1String(".")); if (!Core::HelpManager::instance()->linksForIdentifier(helpId).isEmpty()) break; return false; } while (0); - setLastHelpItemIdentified(TextEditor::HelpItem(helpId, qName.join(QLatin1Char('.')), + setLastHelpItemIdentified(TextEditor::HelpItem(helpId, qName.join(QLatin1String(".")), TextEditor::HelpItem::QmlComponent)); return true; }