Merge remote-tracking branch 'origin/2.8'

2013-05-27 17:21:01 +02:00
parent 1c34b266fb 5b648d8b6e
commit d08ad0038d
217 changed files with 653 additions and 1148 deletions
--- a/src/plugins/vcsbase/checkoutprogresswizardpage.cpp
+++ b/src/plugins/vcsbase/checkoutprogresswizardpage.cpp
@@ -124,17 +124,5 @@ bool CheckoutProgressWizardPage::isComplete() const
    return m_state == Succeeded;
 }

-void CheckoutProgressWizardPage::changeEvent(QEvent *e)
-{
-    QWizardPage::changeEvent(e);
-    switch (e->type()) {
-    case QEvent::LanguageChange:
-        ui->retranslateUi(this);
-        break;
-    default:
-        break;
-    }
-}
-
 } // namespace Internal
 } // namespace VcsBase