Merge branch '4.8' into earth-staging-master

Conflicts:
	dist/changes-4.8.0

7 files changed, 13 insertions, 13 deletions

diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp
index fde24d9..3b02c63 100644
--- a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp
+++ b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp
@@ -51,4 +51,4 @@ void DialogPlugin::registerTypes(const char *uri)
 }
 
 //FileDialog is the plugin name (same as the TARGET in the project file) and DialogPlugin is the plugin classs
-Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin);
\ No newline at end of file
+Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin);
diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp
index c675fc9..52bdfc7 100644
--- a/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp
+++ b/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp
@@ -221,4 +221,4 @@ void Directory::refresh()
         }
         m_fileList.append(file);
     }
-}
\ No newline at end of file
+}
diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp
index 44b0915..17740f2 100644
--- a/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp
+++ b/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp
@@ -54,4 +54,4 @@ void File::setName(const QString &str){
         m_name = str;
         emit nameChanged();
     }
-}
\ No newline at end of file
+}
diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/file.h b/examples/tutorials/gettingStarted/gsQml/filedialog/file.h
index 21e8ebb..6aa6a6a 100644
--- a/examples/tutorials/gettingStarted/gsQml/filedialog/file.h
+++ b/examples/tutorials/gettingStarted/gsQml/filedialog/file.h
@@ -64,4 +64,4 @@ class File : public QObject{
         QString m_name;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/examples/tutorials/gettingStarted/gsQt/part2/main.cpp b/examples/tutorials/gettingStarted/gsQt/part2/main.cpp
index 24b4d77..afa26e1 100755
--- a/examples/tutorials/gettingStarted/gsQt/part2/main.cpp
+++ b/examples/tutorials/gettingStarted/gsQt/part2/main.cpp
@@ -44,17 +44,17 @@ int main(int argv, char **args)
 {
     QApplication app(argv, args);
 
-    QTextEdit textEdit;
-    QPushButton quitButton("&Quit");
+    QTextEdit *textEdit = new QTextEdit;
+    QPushButton *quitButton = new QPushButton("&Quit");
 
-    QObject::connect(&quitButton, SIGNAL(clicked()), qApp, SLOT(quit()));
+    QObject::connect(quitButton, SIGNAL(clicked()), qApp, SLOT(quit()));
 
-    QVBoxLayout layout;
-    layout.addWidget(&textEdit);
-    layout.addWidget(&quitButton);
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(textEdit);
+    layout->addWidget(quitButton);
 
     QWidget window;
-    window.setLayout(&layout);
+    window.setLayout(layout);
 
     window.show();
 
diff --git a/examples/tutorials/modelview/4_headers/main.cpp b/examples/tutorials/modelview/4_headers/main.cpp
index c89829a..8a4ab8f 100755
--- a/examples/tutorials/modelview/4_headers/main.cpp
+++ b/examples/tutorials/modelview/4_headers/main.cpp
@@ -50,4 +50,4 @@ int main(int argc, char *argv[])
     tableView.setModel( &myModel );
     tableView.show();
     return a.exec();
-}
\ No newline at end of file
+}
diff --git a/examples/tutorials/threads/clock/clockthread.h b/examples/tutorials/threads/clock/clockthread.h
index 966dbea..d77a52b 100644
--- a/examples/tutorials/threads/clock/clockthread.h
+++ b/examples/tutorials/threads/clock/clockthread.h
@@ -61,4 +61,4 @@ private slots:
 
 };
 //! [1]
-#endif // CLOCKTHREAD_H
\ No newline at end of file
+#endif // CLOCKTHREAD_H