Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf

2 files changed, 7 insertions, 7 deletions

diff --git a/examples/widgets/dialogs/licensewizard/licensewizard.h b/examples/widgets/dialogs/licensewizard/licensewizard.h
index c7709d88b3..e2890e484f 100644
--- a/examples/widgets/dialogs/licensewizard/licensewizard.h
+++ b/examples/widgets/dialogs/licensewizard/licensewizard.h
@@ -72,7 +72,7 @@ public:
            Page_Conclusion };
 //! [2]
 
-    LicenseWizard(QWidget *parent = 0);
+    LicenseWizard(QWidget *parent = nullptr);
 
 private slots:
     void showHelp();
@@ -86,7 +86,7 @@ class IntroPage : public QWizardPage
     Q_OBJECT
 
 public:
-    IntroPage(QWidget *parent = 0);
+    IntroPage(QWidget *parent = nullptr);
 
     int nextId() const override;
 
@@ -103,7 +103,7 @@ class EvaluatePage : public QWizardPage
     Q_OBJECT
 
 public:
-    EvaluatePage(QWidget *parent = 0);
+    EvaluatePage(QWidget *parent = nullptr);
 
     int nextId() const override;
 
@@ -120,7 +120,7 @@ class RegisterPage : public QWizardPage
     Q_OBJECT
 
 public:
-    RegisterPage(QWidget *parent = 0);
+    RegisterPage(QWidget *parent = nullptr);
 
     int nextId() const override;
 
@@ -136,7 +136,7 @@ class DetailsPage : public QWizardPage
     Q_OBJECT
 
 public:
-    DetailsPage(QWidget *parent = 0);
+    DetailsPage(QWidget *parent = nullptr);
 
     int nextId() const override;
 
@@ -155,7 +155,7 @@ class ConclusionPage : public QWizardPage
     Q_OBJECT
 
 public:
-    ConclusionPage(QWidget *parent = 0);
+    ConclusionPage(QWidget *parent = nullptr);
 
     void initializePage() override;
     int nextId() const override;
diff --git a/examples/widgets/dialogs/licensewizard/main.cpp b/examples/widgets/dialogs/licensewizard/main.cpp
index ed46e792d0..112fcc7aa0 100644
--- a/examples/widgets/dialogs/licensewizard/main.cpp
+++ b/examples/widgets/dialogs/licensewizard/main.cpp
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 
 #ifndef QT_NO_TRANSLATION
-    QString translatorFileName = QLatin1String("qt_");
+    QString translatorFileName = QLatin1String("qtbase_");
     translatorFileName += QLocale::system().name();
     QTranslator *translator = new QTranslator(&app);
     if (translator->load(translatorFileName, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))