diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-09 22:39:27 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-09 22:39:27 +0200 |
commit | 90d59cb8ca0428ef048aa17d0e9d92acc0424ee8 (patch) | |
tree | c25bf46d85bdde277619931f10d12335f1163832 | |
parent | bcaa8575352ad16e1f6020436e1a3f450eefd53e (diff) | |
parent | e0de3b7205efb3d99d38f19d1ee3e7e49ae5045c (diff) | |
download | qttools-90d59cb8ca0428ef048aa17d0e9d92acc0424ee8.tar.gz |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ida20e2ebeb6316e2c6916570ce2e166951af9ee2
-rw-r--r-- | examples/assistant/remotecontrol/remotecontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/assistant/remotecontrol/remotecontrol.cpp b/examples/assistant/remotecontrol/remotecontrol.cpp index 2553d6364..772ea7540 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("/qdoc/index.html"); + << QLatin1String("/qtdoc/index.html"); ui.startUrlLineEdit->setText(rc); |