From 1a945e15fe8b47539b98d2599bf4e16d32e9d179 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Tue, 4 Dec 2012 16:02:19 +0100
Subject: [PATCH] Qt Designer: Fix help URLs.

- Fix building of URLs.
- Correct URLs of manual and style sheet manuals
- Remove the 'What's new' option.

Task-number: QTBUG-28373
Change-Id: I4d1dfd6154f799e9bb00c0a75aa62a7239b0f81f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
---
 src/designer/src/designer/assistantclient.cpp    |  6 +++---
 src/designer/src/designer/qdesigner_actions.cpp  | 14 +-------------
 src/designer/src/designer/qdesigner_actions.h    |  1 -
 src/designer/src/lib/shared/stylesheeteditor.cpp |  2 +-
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/designer/src/designer/assistantclient.cpp b/src/designer/src/designer/assistantclient.cpp
index d036eff..cdde599 100644
--- a/src/designer/src/designer/assistantclient.cpp
+++ b/src/designer/src/designer/assistantclient.cpp
@@ -151,14 +151,14 @@ bool AssistantClient::ensureRunning(QString *errorMessage)
     return true;
 }
 
-QString AssistantClient::documentUrl(const QString &prefix, int qtVersion)
+QString AssistantClient::documentUrl(const QString &module, int qtVersion)
 {
     if (qtVersion == 0)
         qtVersion = QT_VERSION;
     QString rc;
-    QTextStream(&rc) << QStringLiteral("qthelp://com.trolltech.") << prefix << QLatin1Char('.')
+    QTextStream(&rc) << "qthelp://org.qt-project." << module << '.'
                      << (qtVersion >> 16) << ((qtVersion >> 8) & 0xFF) << (qtVersion & 0xFF)
-                     << QStringLiteral("/qdoc/");
+                     << '/' << module << '/';
     return rc;
 }
 
diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp
index 9f77132..d33343c 100644
--- a/src/designer/src/designer/qdesigner_actions.cpp
+++ b/src/designer/src/designer/qdesigner_actions.cpp
@@ -456,11 +456,6 @@ QActionGroup *QDesignerActions::createHelpActions()
     connect(widgetHelp, SIGNAL(triggered()), this, SLOT(showWidgetSpecificHelp()));
     helpActions->addAction(widgetHelp);
 
-    helpActions->addAction(createSeparator(this));
-    QAction *whatsNewAction = new QAction(tr("What's New in Qt Designer?"), this);
-    whatsNewAction->setObjectName(QStringLiteral("__qt_whats_new_in_qt_designer_action"));
-    connect(whatsNewAction, SIGNAL(triggered()), this, SLOT(showWhatsNew()));
-    helpActions->addAction(whatsNewAction);
 #endif
 
     helpActions->addAction(createSeparator(this));
@@ -1049,14 +1044,7 @@ QAction *QDesignerActions::minimizeAction() const
 void QDesignerActions::showDesignerHelp()
 {
     QString url = AssistantClient::designerManualUrl();
-    url += QStringLiteral("designer-manual.html");
-    showHelp(url);
-}
-
-void QDesignerActions::showWhatsNew()
-{
-    QString url = AssistantClient::qtReferenceManualUrl();
-    url += QStringLiteral("qt4-designer.html");
+    url += QStringLiteral("qtdesigner-index.html");
     showHelp(url);
 }
 
diff --git a/src/designer/src/designer/qdesigner_actions.h b/src/designer/src/designer/qdesigner_actions.h
index 2d060c2..d4d6a6c 100644
--- a/src/designer/src/designer/qdesigner_actions.h
+++ b/src/designer/src/designer/qdesigner_actions.h
@@ -139,7 +139,6 @@ private slots:
     void clearRecentFiles();
     void closeForm();
     void showDesignerHelp();
-    void showWhatsNew();
     void aboutDesigner();
     void showWidgetSpecificHelp();
     void backupForms();
diff --git a/src/designer/src/lib/shared/stylesheeteditor.cpp b/src/designer/src/lib/shared/stylesheeteditor.cpp
index 1679bf9..fb89ed3 100644
--- a/src/designer/src/lib/shared/stylesheeteditor.cpp
+++ b/src/designer/src/lib/shared/stylesheeteditor.cpp
@@ -331,7 +331,7 @@ void StyleSheetEditorDialog::insertCssProperty(const QString &name, const QStrin
 
 void StyleSheetEditorDialog::slotRequestHelp()
 {
-    m_core->integration()->emitHelpRequested(QStringLiteral("qt"),
+    m_core->integration()->emitHelpRequested(QStringLiteral("qtwidgets"),
                                              QStringLiteral("stylesheet-reference.html"));
 }
 
-- 
2.7.4