summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-11-01 18:23:22 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-11-01 18:23:22 (GMT)
commit621431fe5128c6d61095dc6cf92d8b34c4c4284b (patch)
tree112c17ab31f63647c7f11f48aeb8a55667300ca3 /examples
parent067e3fb0868814351829647358dea583d28d010e (diff)
parent1575462bf90851fb134db4892e93c04b396543f1 (diff)
downloadQt-621431fe5128c6d61095dc6cf92d8b34c4c4284b.zip
Qt-621431fe5128c6d61095dc6cf92d8b34c4c4284b.tar.gz
Qt-621431fe5128c6d61095dc6cf92d8b34c4c4284b.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Missing icon in the designer documentation Fridge magnet example code snippet error qpaintdevice-qt3.html documentation errors QWebElement example missed information QSPlitter style-sheet example was invalid Errors in QSqlDriver::handle examples QGLColormap example was invalid QPointer made no mention of QWeakPointer Invalid links to http://developer.symbian.org QNetworkDiskCache documentation missed information QStyleSheet example used a property that is hidden. QList document referenced to non existing function QXmlQuery::bindVariable documentation bug Fix multiple typos in QLineF documentation. Qmake project file docs lacked information. Documentation error in SSL document Fix multiple typos in documentation. Fix for QVector::toList - code example documentation.
Diffstat (limited to 'examples')
-rw-r--r--examples/draganddrop/fridgemagnets/dragwidget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/draganddrop/fridgemagnets/dragwidget.cpp b/examples/draganddrop/fridgemagnets/dragwidget.cpp
index 19abfb6..447f7ac 100644
--- a/examples/draganddrop/fridgemagnets/dragwidget.cpp
+++ b/examples/draganddrop/fridgemagnets/dragwidget.cpp
@@ -58,7 +58,7 @@ DragWidget::DragWidget(QWidget *parent)
while (!inputStream.atEnd()) {
QString word;
- inputStream >> word;
+ word = inputStream.readLine();
if (!word.isEmpty()) {
DragLabel *wordLabel = new DragLabel(word, this);
wordLabel->move(x, y);