Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	mkspecs/features/qt_common.prf
	src/plugins/platforms/windows/qwindowsdialoghelpers.cpp

Change-Id: I03b92b6b89ecc5a8db7c95f04ebb92ed198098a8

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/auto/tools/uic/baseline/translationsettings.ui.h b/tests/auto/tools/uic/baseline/translationsettings.ui.h
index e67cba5289..628c42d42e 100644
--- a/tests/auto/tools/uic/baseline/translationsettings.ui.h
+++ b/tests/auto/tools/uic/baseline/translationsettings.ui.h
@@ -102,10 +102,10 @@ public:
 
     void retranslateUi(QDialog *TranslationSettings)
     {
-        TranslationSettings->setWindowTitle(QApplication::translate("TranslationSettings", "Qt Linguist - Translation file settings", 0));
-        groupBox->setTitle(QApplication::translate("TranslationSettings", "Target language", 0));
-        label->setText(QApplication::translate("TranslationSettings", "Language", 0));
-        lblCountry->setText(QApplication::translate("TranslationSettings", "Country/Region", 0));
+        TranslationSettings->setWindowTitle(QApplication::translate("TranslationSettings", "Qt Linguist - Translation file settings", Q_NULLPTR));
+        groupBox->setTitle(QApplication::translate("TranslationSettings", "Target language", Q_NULLPTR));
+        label->setText(QApplication::translate("TranslationSettings", "Language", Q_NULLPTR));
+        lblCountry->setText(QApplication::translate("TranslationSettings", "Country/Region", Q_NULLPTR));
     } // retranslateUi
 
 };