diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-04 20:45:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-04 20:45:01 (GMT) |
| commit | 5749421fdaff0305d217712e3174c85a76b367c4 (patch) | |
| tree | 0b637f8b1b727b1492808cc7856c78e950558dc7 /demos | |
| parent | 70137e5049b14d3b5c7c018b2f2111704878dfee (diff) | |
| parent | 2838cfa7809e6b196a1ee1eb71df5894fc57dd6f (diff) | |
| download | Qt-5749421fdaff0305d217712e3174c85a76b367c4.zip Qt-5749421fdaff0305d217712e3174c85a76b367c4.tar.gz Qt-5749421fdaff0305d217712e3174c85a76b367c4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix the remote command delimiter, this has cahnged at some point.
Assistant: Revert previous commit, issue was already fixed.
fix line endings
fix compilation with -plugin-kbd-*
Fix typo in docs
Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS
Fix compilation with QT_NO_DBUS
fix inaccurate comment
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/qtdemo/menumanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp index 7168b57..c9ffecb 100644 --- a/demos/qtdemo/menumanager.cpp +++ b/demos/qtdemo/menumanager.cpp @@ -313,7 +313,7 @@ void MenuManager::showDocInAssistant(const QString &name) // Send command through remote control even if the process // was started to activate assistant and bring it to front: QTextStream str(&this->assistantProcess); - str << "SetSource " << url << QLatin1Char('\0') << endl; + str << "SetSource " << url << QLatin1Char('\n') << endl; } void MenuManager::launchExample(const QString &name) |