Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2

 Conflicts:
	.qmake.conf

Change-Id: I4cde0b3e88dcfe741b4d1150f1f7b4e6a96e1430

1 files changed, 5 insertions, 5 deletions

diff --git a/doc/src/snippets/widgets-tutorial/notepad/main.cpp b/doc/src/snippets/widgets-tutorial/notepad/main.cpp
index 81c8c20d3..5a76f0255 100644
--- a/doc/src/snippets/widgets-tutorial/notepad/main.cpp
+++ b/doc/src/snippets/widgets-tutorial/notepad/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -59,17 +59,17 @@ int main(int argc, char *argv[])
 {
 //! [2]
 //! [3]
-    QApplication a(argc, argv);
+    QApplication EditorApp(argc, argv);
 //! [3]
 //! [4]
-    Notepad w;
+    Notepad Editor;
 //! [4]
 //! [5]
-    w.show();
+    Editor.show();
 //! [5]
 
 //! [6]
-    return a.exec();
+    return EditorApp.exec();
 //! [6]
 }
 //! [all]