From 5c8930fadd5c1867d36eb8a4b6e73ac8e270b5b5 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 18 Dec 2012 14:41:12 +0100 Subject: [PATCH] Fix help URLs in tools. Task-number: QTBUG-28689 Change-Id: Ifa3eb5ed1ae3928671a85d3aaeb2ef37b196ee4a Reviewed-by: Karsten Heimrich --- examples/assistant/remotecontrol/remotecontrol.cpp | 4 ++-- src/designer/src/designer/assistantclient.cpp | 4 ++-- src/linguist/linguist/mainwindow.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/assistant/remotecontrol/remotecontrol.cpp b/examples/assistant/remotecontrol/remotecontrol.cpp index 2569829..0189993 100644 --- a/examples/assistant/remotecontrol/remotecontrol.cpp +++ b/examples/assistant/remotecontrol/remotecontrol.cpp @@ -59,10 +59,10 @@ RemoteControl::RemoteControl(QWidget *parent, Qt::WindowFlags flags) this, SLOT(on_urlButton_clicked())); QString rc; - QTextStream(&rc) << QLatin1String("qthelp://com.trolltech.qt.") + QTextStream(&rc) << QLatin1String("qthelp://org.qt-project.qtdoc.") << (QT_VERSION >> 16) << ((QT_VERSION >> 8) & 0xFF) << (QT_VERSION & 0xFF) - << QLatin1String("/qdoc/index.html"); + << QLatin1String("/qtdoc/index.html"); ui.startUrlLineEdit->setText(rc); diff --git a/src/designer/src/designer/assistantclient.cpp b/src/designer/src/designer/assistantclient.cpp index cdde599..f112f3e 100644 --- a/src/designer/src/designer/assistantclient.cpp +++ b/src/designer/src/designer/assistantclient.cpp @@ -164,12 +164,12 @@ QString AssistantClient::documentUrl(const QString &module, int qtVersion) QString AssistantClient::designerManualUrl(int qtVersion) { - return documentUrl(QStringLiteral("designer"), qtVersion); + return documentUrl(QStringLiteral("qtdesigner"), qtVersion); } QString AssistantClient::qtReferenceManualUrl(int qtVersion) { - return documentUrl(QStringLiteral("qt"), qtVersion); + return documentUrl(QStringLiteral("qtdoc"), qtVersion); } QT_END_NAMESPACE diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp index ed45265..37abacc 100644 --- a/src/linguist/linguist/mainwindow.cpp +++ b/src/linguist/linguist/mainwindow.cpp @@ -1341,7 +1341,7 @@ void MainWindow::manual() str << QLatin1String("SetSource qthelp://org.qt-project.linguist.") << (QT_VERSION >> 16) << ((QT_VERSION >> 8) & 0xFF) << (QT_VERSION & 0xFF) - << QLatin1String("/linguist/qtlinguist-index.html") + << QLatin1String("/qtlinguist/qtlinguist-index.html") << QLatin1Char('\n') << endl; } -- 2.7.4