Replace com.nokia.qtcreator with org.qt-project.qtcreator

Task-number: QTCREATORBUG-8189
Change-Id: I1c882f55eed901620ef4944bf1789645b7cff34a
Reviewed-by: Kai Koehne <[email protected]>

8 files changed, 13 insertions, 12 deletions

diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 1b89d1083f9..cac11d0ff79 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -161,7 +161,7 @@ DebuggerRunConfigWidget::DebuggerRunConfigWidget(RunConfiguration *runConfigurat
     m_debugServerPortLabel->setBuddy(m_debugServerPort);
 
     m_qmlDebuggerInfoLabel = new QLabel(tr("<a href=\""
-        "qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html"
+        "qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html"
         "\">What are the prerequisites?</a>"));
 
     m_useCppDebugger->setChecked(m_aspect->useCppDebugger());
diff --git a/src/plugins/debugger/lldb/guest/qtcreator-lldb.plist b/src/plugins/debugger/lldb/guest/qtcreator-lldb.plist
index 847183c8a9f..c0a3b2beaf4 100644
--- a/src/plugins/debugger/lldb/guest/qtcreator-lldb.plist
+++ b/src/plugins/debugger/lldb/guest/qtcreator-lldb.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.nokia.qtcreator-lldb</string>
+	<string>org.qt-project.qtcreator-lldb</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 20f3384be67..1c5690c700a 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -488,7 +488,7 @@ void QmlEngine::errorMessageBoxFinished(int result)
     }
     case QMessageBox::Help: {
         Core::HelpManager *helpManager = Core::HelpManager::instance();
-        helpManager->handleHelpRequest(QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html"));
+        helpManager->handleHelpRequest(QLatin1String("qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html"));
         // fall through
     }
     default:
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 9dae8e2d716..9be566c9819 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -422,13 +422,13 @@ ExtensionSystem::IPlugin::ShutdownFlag HelpPlugin::aboutToShutdown()
 
 void HelpPlugin::unregisterOldQtCreatorDocumentation()
 {
-    const QString &nsInternal = QString::fromLatin1("com.nokia.qtcreator.%1%2%3")
+    const QString &nsInternal = QString::fromLatin1("org.qt-project.qtcreator.%1%2%3")
         .arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR).arg(IDE_VERSION_RELEASE);
 
     Core::HelpManager *helpManager = Core::HelpManager::instance();
     QStringList documentationToUnregister;
     foreach (const QString &ns, helpManager->registeredNamespaces()) {
-        if (ns.startsWith(QLatin1String("com.nokia.qtcreator."))
+        if (ns.startsWith(QLatin1String("org.qt-project.qtcreator."))
                 && ns != nsInternal) {
             documentationToUnregister << ns;
         }
@@ -1168,11 +1168,12 @@ void HelpPlugin::handleHelpRequest(const QUrl &url)
 
     QString address = url.toString();
     if (!Core::HelpManager::instance()->findFile(url).isValid()) {
-        if (address.startsWith(QLatin1String("qthelp://com.nokia."))
+        if (address.startsWith(QLatin1String("qthelp://org.qt-project."))
+            || address.startsWith(QLatin1String("qthelp://com.nokia."))
             || address.startsWith(QLatin1String("qthelp://com.trolltech."))) {
                 // local help not installed, resort to external web help
                 QString urlPrefix = QLatin1String("http://doc.qt.digia.com/");
-                if (url.authority() == QLatin1String("com.nokia.qtcreator"))
+                if (url.authority() == QLatin1String("org.qt-project.qtcreator"))
                     urlPrefix.append(QString::fromLatin1("qtcreator"));
                 else
                     urlPrefix.append(QLatin1String("latest"));
@@ -1243,7 +1244,7 @@ void HelpPlugin::slotOpenActionUrl(QAction *action)
 
 void HelpPlugin::slotOpenSupportPage()
 {
-    switchToHelpMode(QUrl(QLatin1String("qthelp://com.nokia.qtcreator/doc/technical-support.html")));
+    switchToHelpMode(QUrl(QLatin1String("qthelp://org.qt-project.qtcreator/doc/technical-support.html")));
 }
 
 void HelpPlugin::slotReportBug()
diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp
index 0182ee3beeb..4d909b8287e 100644
--- a/src/plugins/help/localhelpmanager.cpp
+++ b/src/plugins/help/localhelpmanager.cpp
@@ -101,7 +101,7 @@ BookmarkManager& LocalHelpManager::bookmarkManager()
         if (!m_bookmarkManager) {
             m_bookmarkManager = new BookmarkManager;
             m_bookmarkManager->setupBookmarkModels();
-            const QString &url = QString::fromLatin1("qthelp://com.nokia.qtcreator."
+            const QString &url = QString::fromLatin1("qthelp://org.qt-project.qtcreator."
                 "%1%2%3/doc/index.html").arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR)
                 .arg(IDE_VERSION_RELEASE);
             helpEngine().setCustomValue(QLatin1String("DefaultHomePage"), url);
diff --git a/src/plugins/projectexplorer/sessiondialog.ui b/src/plugins/projectexplorer/sessiondialog.ui
index bf05cffba16..9a9ad068df3 100644
--- a/src/plugins/projectexplorer/sessiondialog.ui
+++ b/src/plugins/projectexplorer/sessiondialog.ui
@@ -105,7 +105,7 @@
    <item row="3" column="0">
     <widget class="QLabel" name="whatsASessionLabel">
      <property name="text">
-      <string>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</string>
+      <string>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</string>
      </property>
     </widget>
    </item>
diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
index 3082bed5dac..e1855fad956 100644
--- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
@@ -322,7 +322,7 @@ void QmlProfilerClientManager::retryMessageBoxFinished(int result)
         break;
     }
     case QMessageBox::Help: {
-        QmlProfilerTool::handleHelpRequest(QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html"));
+        QmlProfilerTool::handleHelpRequest(QLatin1String("qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html"));
         // fall through
     }
     default: {
diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
index eb50233c550..6914286dc66 100644
--- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
@@ -304,7 +304,7 @@ void QmlProfilerEngine::wrongSetupMessageBoxFinished(int button)
 {
     if (button == QMessageBox::Help) {
         Core::HelpManager *helpManager = Core::HelpManager::instance();
-        helpManager->handleHelpRequest(QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html"
+        helpManager->handleHelpRequest(QLatin1String("qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html"
                                "#setting-up-qml-debugging"));
     }
 }