Merge commit 'origin/4.5'

Conflicts:
	demos/boxes/glshaders.cpp
	src/gui/graphicsview/qgraphicsitem.cpp
	tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
	tools/linguist/shared/cpp.cpp
	translations/linguist_ja.qm
	translations/qt_ru.qm

5 files changed, 1 insertions, 15 deletions

diff --git a/examples/tutorials/addressbook/part3/addressbook.cpp b/examples/tutorials/addressbook/part3/addressbook.cpp
index 49c5206160..332e80859b 100644
--- a/examples/tutorials/addressbook/part3/addressbook.cpp
+++ b/examples/tutorials/addressbook/part3/addressbook.cpp
@@ -125,8 +125,7 @@ void AddressBook::submitContact()
     
     if (name == "" || address == "") {
         QMessageBox::information(this, tr("Empty Field"),
-            tr("Please enter a name and adderss."));
-        return;
+            tr("Please enter a name and address."));
     }
 
     if (!contacts.contains(name)) {
@@ -136,7 +135,6 @@ void AddressBook::submitContact()
     } else {
         QMessageBox::information(this, tr("Add Unsuccessful"),
             tr("Sorry, \"%1\" is already in your address book.").arg(name));
-        return;
     }
 
     if (contacts.isEmpty()) {
diff --git a/examples/tutorials/addressbook/part4/addressbook.cpp b/examples/tutorials/addressbook/part4/addressbook.cpp
index 95def9c4d0..06f8a098e5 100644
--- a/examples/tutorials/addressbook/part4/addressbook.cpp
+++ b/examples/tutorials/addressbook/part4/addressbook.cpp
@@ -135,7 +135,6 @@ void AddressBook::submitContact()
     if (name == "" || address == "") {
         QMessageBox::information(this, tr("Empty Field"),
             tr("Please enter a name and address."));
-        return;
     }
 //! [submitContact() function part1]
     if (currentMode == AddingMode) {
@@ -147,7 +146,6 @@ void AddressBook::submitContact()
         } else {
             QMessageBox::information(this, tr("Add Unsuccessful"),
                 tr("Sorry, \"%1\" is already in your address book.").arg(name));
-            return;
         }
 //! [submitContact() function part1]
 //! [submitContact() function part2]
@@ -162,7 +160,6 @@ void AddressBook::submitContact()
             } else {
                 QMessageBox::information(this, tr("Edit Unsuccessful"),
                     tr("Sorry, \"%1\" is already in your address book.").arg(name));
-                return;
             }
         } else if (oldAddress != address) {
             QMessageBox::information(this, tr("Edit Successful"),
diff --git a/examples/tutorials/addressbook/part5/addressbook.cpp b/examples/tutorials/addressbook/part5/addressbook.cpp
index 5afb6b8e0a..af3c2d00bf 100644
--- a/examples/tutorials/addressbook/part5/addressbook.cpp
+++ b/examples/tutorials/addressbook/part5/addressbook.cpp
@@ -142,7 +142,6 @@ void AddressBook::submitContact()
     if (name == "" || address == "") {
         QMessageBox::information(this, tr("Empty Field"),
             tr("Please enter a name and address."));
-        return;
     }
 
     if (currentMode == AddingMode) {
@@ -154,7 +153,6 @@ void AddressBook::submitContact()
         } else {
             QMessageBox::information(this, tr("Add Unsuccessful"),
                 tr("Sorry, \"%1\" is already in your address book.").arg(name));
-            return;
         }
     } else if (currentMode == EditingMode) {
         
@@ -167,7 +165,6 @@ void AddressBook::submitContact()
             } else {
                 QMessageBox::information(this, tr("Edit Unsuccessful"),
                     tr("Sorry, \"%1\" is already in your address book.").arg(name));
-                return;
             }
         } else if (oldAddress != address) {
             QMessageBox::information(this, tr("Edit Successful"),
diff --git a/examples/tutorials/addressbook/part6/addressbook.cpp b/examples/tutorials/addressbook/part6/addressbook.cpp
index b7cd446925..5f31c9952a 100644
--- a/examples/tutorials/addressbook/part6/addressbook.cpp
+++ b/examples/tutorials/addressbook/part6/addressbook.cpp
@@ -148,7 +148,6 @@ void AddressBook::submitContact()
     if (name == "" || address == "") {
         QMessageBox::information(this, tr("Empty Field"),
             tr("Please enter a name and address."));
-        return;
     }
 
     if (currentMode == AddingMode) {
@@ -160,7 +159,6 @@ void AddressBook::submitContact()
         } else {
             QMessageBox::information(this, tr("Add Unsuccessful"),
                 tr("Sorry, \"%1\" is already in your address book.").arg(name));
-            return;
         }
     } else if (currentMode == EditingMode) {
         
@@ -173,7 +171,6 @@ void AddressBook::submitContact()
             } else {
                 QMessageBox::information(this, tr("Edit Unsuccessful"),
                     tr("Sorry, \"%1\" is already in your address book.").arg(name));
-                return;
             }
         } else if (oldAddress != address) {
             QMessageBox::information(this, tr("Edit Successful"),
diff --git a/examples/tutorials/addressbook/part7/addressbook.cpp b/examples/tutorials/addressbook/part7/addressbook.cpp
index 2f81d2bd61..8be4d2b879 100644
--- a/examples/tutorials/addressbook/part7/addressbook.cpp
+++ b/examples/tutorials/addressbook/part7/addressbook.cpp
@@ -150,7 +150,6 @@ void AddressBook::submitContact()
     if (name == "" || address == "") {
         QMessageBox::information(this, tr("Empty Field"),
             tr("Please enter a name and address."));
-        return;
     }
 
     if (currentMode == AddingMode) {
@@ -162,7 +161,6 @@ void AddressBook::submitContact()
         } else {
             QMessageBox::information(this, tr("Add Unsuccessful"),
                 tr("Sorry, \"%1\" is already in your address book.").arg(name));
-            return;
         }
     } else if (currentMode == EditingMode) {
         
@@ -175,7 +173,6 @@ void AddressBook::submitContact()
             } else {
                 QMessageBox::information(this, tr("Edit Unsuccessful"),
                     tr("Sorry, \"%1\" is already in your address book.").arg(name));
-                return;
             }
         } else if (oldAddress != address) {
             QMessageBox::information(this, tr("Edit Successful"),