feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
This commit is contained in:
hjk
2010-06-02 09:57:23 +02:00
parent 89687ddd4b 13e042737f
commit 5806009d29
94 changed files with 5086 additions and 3391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/help/helpmanager.h
View File

@@ -57,8 +57,6 @@ public:
void setupGuiHelpEngine();
bool guiEngineNeedsUpdate() const;
void handleHelpRequest(const QString &url);
void verifyDocumenation();
void registerDocumentation(const QStringList &fileNames);
void unregisterDocumentation(const QStringList &nameSpaces);
@@ -69,6 +67,9 @@ public:
static BookmarkManager& bookmarkManager();
public slots:
void handleHelpRequest(const QString &url);
signals:
void helpRequested(const QUrl &url);

3
src/plugins/help/helpplugin.cpp
View File

@@ -852,8 +852,7 @@ void HelpPlugin::handleHelpRequest(const QUrl &url)
// local help not installed, resort to external web help
QString urlPrefix = QLatin1String("http://doc.trolltech.com/");
if (url.authority() == QLatin1String("com.nokia.qtcreator")) {
urlPrefix.append(QString::fromLatin1("qtcreator-%1.%2")
.arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR));
urlPrefix.append(QString::fromLatin1("qtcreator"));
} else {
urlPrefix.append(QLatin1String("latest"));
}