diff options
-rw-r--r-- | examples/assistant/doc/src/simpletextviewer.qdoc | 6 | ||||
-rw-r--r-- | examples/assistant/remotecontrol/remotecontrol.cpp | 2 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/assistant.cpp | 4 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/simpletextviewer.qch | bin | 108544 -> 108544 bytes | |||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/simpletextviewer.qhc | bin | 18432 -> 18432 bytes | |||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/simpletextviewer.qhcp | 4 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/documentation/simpletextviewer.qhp | 2 | ||||
-rw-r--r-- | examples/assistant/simpletextviewer/mainwindow.cpp | 2 | ||||
-rw-r--r-- | src/assistant/assistant/Info_mac.plist | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/examples/assistant/doc/src/simpletextviewer.qdoc b/examples/assistant/doc/src/simpletextviewer.qdoc index 51e0a874a..335cf8fb3 100644 --- a/examples/assistant/doc/src/simpletextviewer.qdoc +++ b/examples/assistant/doc/src/simpletextviewer.qdoc @@ -96,7 +96,7 @@ \code <?xml version="1.0" encoding="UTF-8"?> <QtHelpProject version="1.0"> - <namespace>com.trolltech.examples.simpletextviewer</namespace> + <namespace>org.qt-project.examples.simpletextviewer</namespace> <virtualFolder>doc</virtualFolder> \endcode @@ -223,7 +223,7 @@ <assistant> <title>Simple Text Viewer</title> <applicationIcon>images/handbook.png</applicationIcon> - <cacheDirectory>Trolltech/SimpleTextViewer</cacheDirectory> + <cacheDirectory>QtProject/SimpleTextViewer</cacheDirectory> \endcode The \c cacheDirectory tag specifies a subdirectory of the users @@ -238,7 +238,7 @@ actual page file name. \code - <startPage>qthelp://com.trolltech.examples.simpletextviewer/doc/index.html</startPage> + <startPage>qthelp://org.qt-project.examples.simpletextviewer/doc/index.html</startPage> \endcode Next, we alter the name of the "About" menu item to "About Simple diff --git a/examples/assistant/remotecontrol/remotecontrol.cpp b/examples/assistant/remotecontrol/remotecontrol.cpp index 772ea7540..2553d6364 100644 --- a/examples/assistant/remotecontrol/remotecontrol.cpp +++ b/examples/assistant/remotecontrol/remotecontrol.cpp @@ -62,7 +62,7 @@ RemoteControl::RemoteControl(QWidget *parent, Qt::WindowFlags flags) QTextStream(&rc) << QLatin1String("qthelp://org.qt-project.qtdoc.") << (QT_VERSION >> 16) << ((QT_VERSION >> 8) & 0xFF) << (QT_VERSION & 0xFF) - << QLatin1String("/qtdoc/index.html"); + << QLatin1String("/qdoc/index.html"); ui.startUrlLineEdit->setText(rc); diff --git a/examples/assistant/simpletextviewer/assistant.cpp b/examples/assistant/simpletextviewer/assistant.cpp index 5e4d0993f..c3740d647 100644 --- a/examples/assistant/simpletextviewer/assistant.cpp +++ b/examples/assistant/simpletextviewer/assistant.cpp @@ -70,7 +70,7 @@ void Assistant::showDocumentation(const QString &page) return; QByteArray ba("SetSource "); - ba.append("qthelp://com.trolltech.examples.simpletextviewer/doc/"); + ba.append("qthelp://org.qt-project.examples.simpletextviewer/doc/"); proc->write(ba + page.toLocal8Bit() + '\n'); } @@ -93,7 +93,7 @@ bool Assistant::startAssistant() QStringList args; args << QLatin1String("-collectionFile") << QLibraryInfo::location(QLibraryInfo::ExamplesPath) - + QLatin1String("/qtassistant/simpletextviewer/documentation/simpletextviewer.qhc") + + QLatin1String("/assistant/simpletextviewer/documentation/simpletextviewer.qhc") << QLatin1String("-enableRemoteControl"); proc->start(app, args); diff --git a/examples/assistant/simpletextviewer/documentation/simpletextviewer.qch b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qch Binary files differindex c40132803..f8a1ce39f 100644 --- a/examples/assistant/simpletextviewer/documentation/simpletextviewer.qch +++ b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qch diff --git a/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhc b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhc Binary files differindex db380cabf..33ef3ff99 100644 --- a/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhc +++ b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhc diff --git a/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhcp b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhcp index e7c23210b..698c57b70 100644 --- a/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhcp +++ b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhcp @@ -3,8 +3,8 @@ <assistant> <title>Simple Text Viewer</title> <applicationIcon>images/handbook.png</applicationIcon> - <cacheDirectory>Trolltech/SimpleTextViewer</cacheDirectory> - <startPage>qthelp://com.trolltech.examples.simpletextviewer/doc/index.html</startPage> + <cacheDirectory>QtProject/SimpleTextViewer</cacheDirectory> + <startPage>qthelp://org.qt-project.examples.simpletextviewer/doc/index.html</startPage> <aboutMenuText> <text>About Simple Text Viewer</text> </aboutMenuText> diff --git a/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhp b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhp index 4cb83a5f3..eddc60373 100644 --- a/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhp +++ b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhp @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <QtHelpProject version="1.0"> - <namespace>com.trolltech.examples.simpletextviewer</namespace> + <namespace>org.qt-project.examples.simpletextviewer</namespace> <virtualFolder>doc</virtualFolder> <filterSection> <toc> diff --git a/examples/assistant/simpletextviewer/mainwindow.cpp b/examples/assistant/simpletextviewer/mainwindow.cpp index fe4e132ca..bc1700173 100644 --- a/examples/assistant/simpletextviewer/mainwindow.cpp +++ b/examples/assistant/simpletextviewer/mainwindow.cpp @@ -57,7 +57,7 @@ MainWindow::MainWindow() // ![0] textViewer = new TextEdit; textViewer->setContents(QLibraryInfo::location(QLibraryInfo::ExamplesPath) - + QLatin1String("/qtassistant/simpletextviewer/documentation/intro.html")); + + QLatin1String("/assistant/simpletextviewer/documentation/intro.html")); setCentralWidget(textViewer); createActions(); diff --git a/src/assistant/assistant/Info_mac.plist b/src/assistant/assistant/Info_mac.plist index 76369a1c5..48b84804e 100644 --- a/src/assistant/assistant/Info_mac.plist +++ b/src/assistant/assistant/Info_mac.plist @@ -11,7 +11,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleIdentifier</key> - <string>com.trolltech.assistant</string> + <string>org.qt-project.assistant</string> <key>CFBundleExecutable</key> <string>@EXECUTABLE@</string> </dict> |