Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7

4 files changed, 4 insertions, 4 deletions

diff --git a/demos/books/bookwindow.cpp b/demos/books/bookwindow.cpp
index 089d5e0..c801283 100644
--- a/demos/books/bookwindow.cpp
+++ b/demos/books/bookwindow.cpp
@@ -64,7 +64,7 @@ BookWindow::BookWindow()
     model->setEditStrategy(QSqlTableModel::OnManualSubmit);
     model->setTable("books");
 
-    // Remeber the indexes of the columns
+    // Remember the indexes of the columns
     authorIdx = model->fieldIndex("author");
     genreIdx = model->fieldIndex("genre");
 
diff --git a/demos/browser/browsermainwindow.cpp b/demos/browser/browsermainwindow.cpp
index 8c2ed89..50c2cf8 100644
--- a/demos/browser/browsermainwindow.cpp
+++ b/demos/browser/browsermainwindow.cpp
@@ -670,7 +670,7 @@ void BrowserMainWindow::slotPrivateBrowsing()
             " items are automatically removed from the Downloads window," \
             " new cookies are not stored, current cookies can't be accessed," \
             " site icons wont be stored, session wont be saved, " \
-            " and searches are not addded to the pop-up menu in the Google search box." \
+            " and searches are not added to the pop-up menu in the Google search box." \
             "  Until you close the window, you can still click the Back and Forward buttons" \
             " to return to the webpages you have opened.").arg(title);
 
diff --git a/demos/browser/webview.cpp b/demos/browser/webview.cpp
index 2f9b3e6..2cbd2f1 100644
--- a/demos/browser/webview.cpp
+++ b/demos/browser/webview.cpp
@@ -260,7 +260,7 @@ void WebView::setProgress(int progress)
 void WebView::loadFinished()
 {
     if (100 != m_progress) {
-        qWarning() << "Recieved finished signal while progress is still:" << progress()
+        qWarning() << "Received finished signal while progress is still:" << progress()
                    << "Url:" << url();
     }
     m_progress = 0;
diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp
index c9ffecb..5b851b4 100644
--- a/demos/qtdemo/menumanager.cpp
+++ b/demos/qtdemo/menumanager.cpp
@@ -449,7 +449,7 @@ void MenuManager::init(MainWindow *window)
         window->scene->setStickyFocus(true);
         window->setFocus();
     }else{
-        qDebug() << "Error intializing QML subsystem, Declarative examples will not work";
+        qDebug() << "Error initializing QML subsystem, Declarative examples will not work";
     }
 }