Move tutorials to widgets.

All of these are very QWidget centric.
They cannot properly refer to the
sources without being part of the widget module.

This fixes around 300 qdoc errors.

Change-Id: I5a7c2dbc10f7913f7b088d6a0ac81323b3c287ac
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>

43 files changed, 0 insertions, 3569 deletions

diff --git a/examples/tutorials/addressbook-fr/README b/examples/tutorials/addressbook-fr/README
deleted file mode 100644
index d24cedf51e..0000000000
--- a/examples/tutorials/addressbook-fr/README
+++ /dev/null
@@ -1,40 +0,0 @@
-The Address Book Tutorial shows how to put together a simple yet
-fully-functioning GUI application. The tutorial chapters can be found in the
-Qt documentation, which can be viewed using Qt Assistant or a Web browser.
-
-The tutorial is also available online at
-
-http://qt.nokia.com/doc/4.4/tutorial.html
-
-All programs corresponding to the chapters in the tutorial should
-automatically be built when Qt is compiled, or will be provided as
-pre-built executables if you have obtained a binary package of Qt.
-
-If you have only compiled the Qt libraries, use the following instructions
-to build the tutorial.
-
-On Linux/Unix:
-
-Typing 'make' in this directory builds all the programs (part1/part1,
-part2/part2, part3/part3 and so on). Typing 'make' in each subdirectory
-builds just that tutorial program.
-
-On Windows:
-
-Create a single Visual Studio project for the tutorial directory in
-the usual way. You can do this by typing the following at the command
-line:
-
-qmake -tp vc
-
-You should now be able to open the project file in Visual Studio and
-build all of the tutorial programs at the same time.
-
-On Mac OS X:
-
-Create an Xcode project with the .pro file in the tutorial directory.
-You can do this by typing the following at the command line:
-
-qmake -spec macx-xcode
-
-Then open the generated Xcode project in Xcode and build it.
diff --git a/examples/tutorials/addressbook-fr/addressbook-fr.pro b/examples/tutorials/addressbook-fr/addressbook-fr.pro
deleted file mode 100644
index 0ee8387437..0000000000
--- a/examples/tutorials/addressbook-fr/addressbook-fr.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE  = subdirs
-SUBDIRS   = part1 part2 part3 part4 part5 part6 part7
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook-fr
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS addressbook-fr.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook-fr
-INSTALLS += target sources
-QT += widgets
-
diff --git a/examples/tutorials/addressbook-fr/part1/addressbook.cpp b/examples/tutorials/addressbook-fr/part1/addressbook.cpp
deleted file mode 100644
index 119baacb37..0000000000
--- a/examples/tutorials/addressbook-fr/part1/addressbook.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "addressbook.h"
-
-//! [constructor and input fields]
-AddressBook::AddressBook(QWidget *parent)
-    : QWidget(parent)
-{
-    QLabel *nameLabel = new QLabel(tr("Name:"));
-    nameLine = new QLineEdit;
-
-    QLabel *addressLabel = new QLabel(tr("Address:"));
-    addressText = new QTextEdit;
-//! [constructor and input fields]
-
-//! [layout]
-    QGridLayout *mainLayout = new QGridLayout;
-    mainLayout->addWidget(nameLabel, 0, 0);
-    mainLayout->addWidget(nameLine, 0, 1);
-    mainLayout->addWidget(addressLabel, 1, 0, Qt::AlignTop);
-    mainLayout->addWidget(addressText, 1, 1);
-//! [layout]
-
-//![setting the layout]    
-    setLayout(mainLayout);
-    setWindowTitle(tr("Simple Address Book"));
-}
-//! [setting the layout]
diff --git a/examples/tutorials/addressbook-fr/part1/addressbook.h b/examples/tutorials/addressbook-fr/part1/addressbook.h
deleted file mode 100644
index 0bcd93e3bb..0000000000
--- a/examples/tutorials/addressbook-fr/part1/addressbook.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef ADDRESSBOOK_H
-#define ADDRESSBOOK_H
-
-#include <QWidget>
-
-QT_BEGIN_NAMESPACE
-class QLabel;
-class QLineEdit;
-class QTextEdit;
-QT_END_NAMESPACE
-
-//! [class definition]
-class AddressBook : public QWidget
-{
-    Q_OBJECT
-
-public:
-    AddressBook(QWidget *parent = 0);
-
-private:
-    QLineEdit *nameLine;
-    QTextEdit *addressText;
-};
-//! [class definition]
-
-#endif
diff --git a/examples/tutorials/addressbook-fr/part1/main.cpp b/examples/tutorials/addressbook-fr/part1/main.cpp
deleted file mode 100644
index 09562a2d2b..0000000000
--- a/examples/tutorials/addressbook-fr/part1/main.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "addressbook.h"
-
-//! [main function]
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    AddressBook addressBook;
-    addressBook.show();
-
-    return app.exec();
-}
-//! [main function]
diff --git a/examples/tutorials/addressbook-fr/part1/part1.desktop b/examples/tutorials/addressbook-fr/part1/part1.desktop
deleted file mode 100644
index 0cf4115f33..0000000000
--- a/examples/tutorials/addressbook-fr/part1/part1.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=1 Address Book FR
-Exec=/opt/usr/bin/part1
-Icon=part1
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/tutorials/addressbook-fr/part1/part1.pro b/examples/tutorials/addressbook-fr/part1/part1.pro
deleted file mode 100644
index f04c8ff10d..0000000000
--- a/examples/tutorials/addressbook-fr/part1/part1.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-SOURCES   = addressbook.cpp \
-            main.cpp
-HEADERS   = addressbook.h
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part1
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part1.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part1
-INSTALLS += target sources
-QT += widgets
-
-
-simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/tutorials/addressbook-fr/part2/addressbook.cpp b/examples/tutorials/addressbook-fr/part2/addressbook.cpp
deleted file mode 100644
index 503cf90ada..0000000000
--- a/examples/tutorials/addressbook-fr/part2/addressbook.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "addressbook.h"
-
-AddressBook::AddressBook(QWidget *parent)
-    : QWidget(parent)
-{
-    QLabel *nameLabel = new QLabel(tr("Name:"));
-    nameLine = new QLineEdit;
-//! [setting readonly 1]
-    nameLine->setReadOnly(true);
-//! [setting readonly 1]
-    QLabel *addressLabel = new QLabel(tr("Address:"));
-    addressText = new QTextEdit;
-//! [setting readonly 2]    
-    addressText->setReadOnly(true);
-//! [setting readonly 2]
-   
-//! [pushbutton declaration]
-    addButton = new QPushButton(tr("&Add"));
-    addButton->show();
-    submitButton = new QPushButton(tr("&Submit"));
-    submitButton->hide();
-    cancelButton = new QPushButton(tr("&Cancel"));
-    cancelButton->hide();
-//! [pushbutton declaration]
-//! [connecting signals and slots]
-    connect(addButton, SIGNAL(clicked()), this, SLOT(addContact()));
-    connect(submitButton, SIGNAL(clicked()), this, SLOT(submitContact()));
-    connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
-//! [connecting signals and slots]
-//! [vertical layout]
-    QVBoxLayout *buttonLayout1 = new QVBoxLayout;
-    buttonLayout1->addWidget(addButton, Qt::AlignTop);
-    buttonLayout1->addWidget(submitButton);
-    buttonLayout1->addWidget(cancelButton);
-    buttonLayout1->addStretch();
-//! [vertical layout]
-//! [grid layout]
-    QGridLayout *mainLayout = new QGridLayout;
-    mainLayout->addWidget(nameLabel, 0, 0);
-    mainLayout->addWidget(nameLine, 0, 1);
-    mainLayout->addWidget(addressLabel, 1, 0, Qt::AlignTop);
-    mainLayout->addWidget(addressText, 1, 1);
-    mainLayout->addLayout(buttonLayout1, 1, 2);
-//! [grid layout]
-    setLayout(mainLayout);
-    setWindowTitle(tr("Simple Address Book"));
-}
-//! [addContact]
-void AddressBook::addContact()
-{
-    oldName = nameLine->text();
-    oldAddress = addressText->toPlainText();
-
-    nameLine->clear();
-    addressText->clear();
-    
-    nameLine->setReadOnly(false);
-    nameLine->setFocus(Qt::OtherFocusReason);
-    addressText->setReadOnly(false);
-
-    addButton->setEnabled(false);
-    submitButton->show();
-    cancelButton->show();
-}
-//! [addContact]
-
-//! [submitContact part1]
-void AddressBook::submitContact()
-{
-    QString name = nameLine->text();
-    QString address = addressText->toPlainText();
-    
-    if ( name.isEmpty()|| address.isEmpty()) {
-        QMessageBox::information(this, tr("Empty Field"),
-            tr("Please enter a name and address."));
-        return;
-    }
-//! [submitContact part1]
-//! [submitContact part2]
-    if (!contacts.contains(name)) {
-        contacts.insert(name, address);
-        QMessageBox::information(this, tr("Add Successful"),
-            tr("\"%1\" has been added to your address book.").arg(name));
-    } else {
-        QMessageBox::information(this, tr("Add Unsuccessful"),
-            tr("Sorry, \"%1\" is already in your address book.").arg(name));
-        return;
-    }
-//! [submitContact part2]
-//! [submitContact part3]
-    if (contacts.isEmpty()) {
-        nameLine->clear();
-        addressText->clear();
-    }
-
-    nameLine->setReadOnly(true);
-    addressText->setReadOnly(true);
-    addButton->setEnabled(true);
-    submitButton->hide();
-    cancelButton->hide();
-}
-//! [submitContact part3]
-//! [cancel]
-void AddressBook::cancel()
-{
-    nameLine->setText(oldName);
-    nameLine->setReadOnly(true);
-
-    addressText->setText(oldAddress);
-    addressText->setReadOnly(true);
-
-    addButton->setEnabled(true);
-    submitButton->hide();
-    cancelButton->hide();    
-}
-//! [cancel]
diff --git a/examples/tutorials/addressbook-fr/part2/addressbook.h b/examples/tutorials/addressbook-fr/part2/addressbook.h
deleted file mode 100644
index c2cc341d60..0000000000
--- a/examples/tutorials/addressbook-fr/part2/addressbook.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef ADDRESSBOOK_H
-#define ADDRESSBOOK_H
-
-#include <QWidget>
-#include <QMap>
-
-QT_BEGIN_NAMESPACE
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QTextEdit;
-QT_END_NAMESPACE
-
-class AddressBook : public QWidget
-{
-    Q_OBJECT
-
-public:
-    AddressBook(QWidget *parent = 0);
-
-//! [slots]
-public slots:
-    void addContact();
-    void submitContact();
-    void cancel();
-//! [slots]
-
-//! [pushbutton declaration]
-private:
-    QPushButton *addButton;
-    QPushButton *submitButton;
-    QPushButton *cancelButton;
-    QLineEdit *nameLine;
-    QTextEdit *addressText;
-//! [pushbutton declaration]
-
-//! [remaining private variables]
-    QMap<QString, QString> contacts;
-    QString oldName;
-    QString oldAddress;
-};
-//! [remaining private variables]
-
-#endif
diff --git a/examples/tutorials/addressbook-fr/part2/main.cpp b/examples/tutorials/addressbook-fr/part2/main.cpp
deleted file mode 100644
index 09562a2d2b..0000000000
--- a/examples/tutorials/addressbook-fr/part2/main.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "addressbook.h"
-
-//! [main function]
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    AddressBook addressBook;
-    addressBook.show();
-
-    return app.exec();
-}
-//! [main function]
diff --git a/examples/tutorials/addressbook-fr/part2/part2.desktop b/examples/tutorials/addressbook-fr/part2/part2.desktop
deleted file mode 100644
index 681c6a1e4d..0000000000
--- a/examples/tutorials/addressbook-fr/part2/part2.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=2 Address Book FR
-Exec=/opt/usr/bin/part2
-Icon=part2
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/tutorials/addressbook-fr/part2/part2.pro b/examples/tutorials/addressbook-fr/part2/part2.pro
deleted file mode 100644
index 46f811676a..0000000000
--- a/examples/tutorials/addressbook-fr/part2/part2.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-SOURCES   = addressbook.cpp \
-            main.cpp
-HEADERS   = addressbook.h
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part2
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part2.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part2
-INSTALLS += target sources
-QT += widgets
-
-
-simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/tutorials/addressbook-fr/part3/addressbook.cpp b/examples/tutorials/addressbook-fr/part3/addressbook.cpp
deleted file mode 100644
index d83d31b08f..0000000000
--- a/examples/tutorials/addressbook-fr/part3/addressbook.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "addressbook.h"
-
-AddressBook::AddressBook(QWidget *parent)
-    : QWidget(parent)
-{
-    QLabel *nameLabel = new QLabel(tr("Name:"));
-    nameLine = new QLineEdit;
-    nameLine->setReadOnly(true);
-
-    QLabel *addressLabel = new QLabel(tr("Address:"));
-    addressText = new QTextEdit;
-    addressText->setReadOnly(true);
-    
-    addButton = new QPushButton(tr("&Add"));
-    addButton->show();
-    submitButton = new QPushButton(tr("&Submit"));
-    submitButton->hide();
-    cancelButton = new QPushButton(tr("&Cancel"));
-    cancelButton->hide();
-//! [navigation pushbuttons]
-    nextButton = new QPushButton(tr("&Next"));
-    nextButton->setEnabled(false);
-    previousButton = new QPushButton(tr("&Previous"));
-    previousButton->setEnabled(false);
-//! [navigation pushbuttons]
-
-    connect(addButton, SIGNAL(clicked()), this, SLOT(addContact()));
-    connect(submitButton, SIGNAL(clicked()), this, SLOT(submitContact()));
-    connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
-//! [connecting navigation signals]    
-    connect(nextButton, SIGNAL(clicked()), this, SLOT(next()));
-    connect(previousButton, SIGNAL(clicked()), this, SLOT(previous()));
-//! [connecting navigation signals]
-
-    QVBoxLayout *buttonLayout1 = new QVBoxLayout;
-    buttonLayout1->addWidget(addButton, Qt::AlignTop);
-    buttonLayout1->addWidget(submitButton);
-    buttonLayout1->addWidget(cancelButton);
-    buttonLayout1->addStretch();
-//! [navigation layout]
-    QHBoxLayout *buttonLayout2 = new QHBoxLayout;
-    buttonLayout2->addWidget(previousButton);
-    buttonLayout2->addWidget(nextButton);
-//! [ navigation layout]
-    QGridLayout *mainLayout = new QGridLayout;
-    mainLayout->addWidget(nameLabel, 0, 0);
-    mainLayout->addWidget(nameLine, 0, 1);
-    mainLayout->addWidget(addressLabel, 1, 0, Qt::AlignTop);
-    mainLayout->addWidget(addressText, 1, 1);
-    mainLayout->addLayout(buttonLayout1, 1, 2);
-//! [adding navigation layout]
-    mainLayout->addLayout(buttonLayout2, 3, 1);
-//! [adding navigation layout]
-    setLayout(mainLayout);
-    setWindowTitle(tr("Simple Address Book"));
-}
-
-void AddressBook::addContact()
-{
-    oldName = nameLine->text();
-    oldAddress = addressText->toPlainText();
-
-    nameLine->clear();
-    addressText->clear();
-
-    nameLine->setReadOnly(false);
-    nameLine->setFocus(Qt::OtherFocusReason);
-    addressText->setReadOnly(false);
-    
-    addButton->setEnabled(false);
-//! [disabling navigation]
-    nextButton->setEnabled(false);
-    previousButton->setEnabled(false);
-//! [disabling navigation]
-    submitButton->show();
-    cancelButton->show();
-}
-
-void AddressBook::submitContact()
-{
-    QString name = nameLine->text();
-    QString address = addressText->toPlainText();
-    
-    if (name.isEmpty() || address.isEmpty()) {
-        QMessageBox::information(this, tr("Empty Field"),
-            tr("Please enter a name and address."));
-	return;
-    }
-
-    if (!contacts.contains(name)) {
-        contacts.insert(name, address);
-        QMessageBox::information(this, tr("Add Successful"),
-            tr("\"%1\" has been added to your address book.").arg(name));
-    } else {
-        QMessageBox::information(this, tr("Add Unsuccessful"),
-            tr("Sorry, \"%1\" is already in your address book.").arg(name));
-    }
-
-    if (contacts.isEmpty()) {
-        nameLine->clear();
-        addressText->clear();
-    }
-
-    nameLine->setReadOnly(true);
-    addressText->setReadOnly(true);
-    addButton->setEnabled(true);
-
-//! [enabling navigation]
-    int number = contacts.size();
-    nextButton->setEnabled(number > 1);
-    previousButton->setEnabled(number > 1);
-//! [enabling navigation]
-    submitButton->hide();
-    cancelButton->hide();
-}
-
-void AddressBook::cancel()
-{
-    nameLine->setText(oldName);
-    addressText->setText(oldAddress);
-   
-    if (contacts.isEmpty()) {
-        nameLine->clear();
-        addressText->clear();
-    }
-    
-    nameLine->setReadOnly(true);
-    addressText->setReadOnly(true);
-    addButton->setEnabled(true);
-    
-    int number = contacts.size();
-    nextButton->setEnabled(number > 1);
-    previousButton->setEnabled(number > 1);
-    
-    submitButton->hide();
-    cancelButton->hide();
-}
-
-//! [next() function]
-void AddressBook::next()
-{
-    QString name = nameLine->text();
-    QMap<QString, QString>::iterator i = contacts.find(name);
-
-    if (i != contacts.end())
-        i++;
-
-    if (i == contacts.end())
-        i = contacts.begin();
-
-    nameLine->setText(i.key());
-    addressText->setText(i.value());
-}
-//! [next() function]
-//! [previous() function]
-void AddressBook::previous()
-{
-    QString name = nameLine->text();
-    QMap<QString, QString>::iterator i = contacts.find(name);
-
-    if (i == contacts.end()){
-        nameLine->clear();
-        addressText->clear();
-        return;
-    }
-
-    if (i == contacts.begin())
-        i = contacts.end();
-
-    i--;
-    nameLine->setText(i.key());
-    addressText->setText(i.value());
-}
-//! [previous() function]
diff --git a/examples/tutorials/addressbook-fr/part3/addressbook.h b/examples/tutorials/addressbook-fr/part3/addressbook.h
deleted file mode 100644
index 5c6f398ba0..0000000000
--- a/examples/tutorials/addressbook-fr/part3/addressbook.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef ADDRESSBOOK_H
-#define ADDRESSBOOK_H
-
-#include <QWidget>
-#include <QMap>
-
-QT_BEGIN_NAMESPACE
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QTextEdit;
-QT_END_NAMESPACE
-
-class AddressBook : public QWidget
-{
-    Q_OBJECT
-
-public:
-    AddressBook(QWidget *parent = 0);
-
-public slots:
-    void addContact();
-    void submitContact();
-    void cancel();
-//! [navigation functions]
-    void next();
-    void previous();
-//! [navigation functions]    
-
-private:
-    QPushButton *addButton;
-    QPushButton *submitButton;
-    QPushButton *cancelButton;
-//! [navigation pushbuttons]    
-    QPushButton *nextButton;
-    QPushButton *previousButton;
-//! [navigation pushbuttons]    
-    QLineEdit *nameLine;
-    QTextEdit *addressText;
-
-    QMap<QString, QString> contacts;
-    QString oldName;
-    QString oldAddress;
-};
-
-#endif
diff --git a/examples/tutorials/addressbook-fr/part3/main.cpp b/examples/tutorials/addressbook-fr/part3/main.cpp
deleted file mode 100644
index 663fbb7d09..0000000000
--- a/examples/tutorials/addressbook-fr/part3/main.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "addressbook.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    AddressBook addressBook;
-    addressBook.show();
-
-    return app.exec();
-}
diff --git a/examples/tutorials/addressbook-fr/part3/part3.desktop b/examples/tutorials/addressbook-fr/part3/part3.desktop
deleted file mode 100644
index 3c97d51f4e..0000000000
--- a/examples/tutorials/addressbook-fr/part3/part3.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=3 Address Book FR
-Exec=/opt/usr/bin/part3
-Icon=part3
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/tutorials/addressbook-fr/part3/part3.pro b/examples/tutorials/addressbook-fr/part3/part3.pro
deleted file mode 100644
index d76baaae5d..0000000000
--- a/examples/tutorials/addressbook-fr/part3/part3.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-SOURCES = addressbook.cpp \
-          main.cpp
-HEADERS = addressbook.h
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part3
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part3.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part3
-INSTALLS += target sources
-QT += widgets
-
-
-simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/tutorials/addressbook-fr/part4/addressbook.cpp b/examples/tutorials/addressbook-fr/part4/addressbook.cpp
deleted file mode 100644
index 45999d4710..0000000000
--- a/examples/tutorials/addressbook-fr/part4/addressbook.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "addressbook.h"
-
-AddressBook::AddressBook(QWidget *parent)
-    : QWidget(parent)
-{
-    QLabel *nameLabel = new QLabel(tr("Name:"));
-    nameLine = new QLineEdit;
-    nameLine->setReadOnly(true);
-
-    QLabel *addressLabel = new QLabel(tr("Address:"));
-    addressText = new QTextEdit;
-    addressText->setReadOnly(true);
-
-    addButton = new QPushButton(tr("&Add"));
-//! [edit and remove buttons] 
-    editButton = new QPushButton(tr("&Edit"));
-    editButton->setEnabled(false);
-    removeButton = new QPushButton(tr("&Remove"));
-    removeButton->setEnabled(false);
-//! [edit and remove buttons] 
-    submitButton = new QPushButton(tr("&Submit"));
-    submitButton->hide();
-    cancelButton = new QPushButton(tr("&Cancel"));
-    cancelButton->hide();
-    
-    nextButton = new QPushButton(tr("&Next"));
-    nextButton->setEnabled(false);
-    previousButton = new QPushButton(tr("&Previous"));
-    previousButton->setEnabled(false);
-
-    connect(addButton, SIGNAL(clicked()), this, SLOT(addContact()));
-    connect(submitButton, SIGNAL(clicked()), this, SLOT(submitContact()));
-//! [connecting edit and remove] 
-    connect(editButton, SIGNAL(clicked()), this, SLOT(editContact()));
-    connect(removeButton, SIGNAL(clicked()), this, SLOT(removeContact()));
-//! [connecting edit and remove] 
-    connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
-    connect(nextButton, SIGNAL(clicked()), this, SLOT(next()));
-    connect(previousButton, SIGNAL(clicked()), this, SLOT(previous()));
-
-    QVBoxLayout *buttonLayout1 = new QVBoxLayout;
-    buttonLayout1->addWidget(addButton);
-//! [adding edit and remove to the layout]     
-    buttonLayout1->addWidget(editButton);
-    buttonLayout1->addWidget(removeButton);
-//! [adding edit and remove to the layout]         
-    buttonLayout1->addWidget(submitButton);
-    buttonLayout1->addWidget(cancelButton);
-    buttonLayout1->addStretch();
-
-    QHBoxLayout *buttonLayout2 = new QHBoxLayout;
-    buttonLayout2->addWidget(previousButton);
-    buttonLayout2->addWidget(nextButton);
-
-    QGridLayout *mainLayout = new QGridLayout;
-    mainLayout->addWidget(nameLabel, 0, 0);
-    mainLayout->addWidget(nameLine, 0, 1);
-    mainLayout->addWidget(addressLabel, 1, 0, Qt::AlignTop);
-    mainLayout->addWidget(addressText, 1, 1);
-    mainLayout->addLayout(buttonLayout1, 1, 2);
-    mainLayout->addLayout(buttonLayout2, 3, 1);
-
-    setLayout(mainLayout);
-    setWindowTitle(tr("Simple Address Book"));
-}
-
-void AddressBook::addContact()
-{
-    oldName = nameLine->text();
-    oldAddress = addressText->toPlainText();
-
-    nameLine->clear();
-    addressText->clear();
-
-    updateInterface(AddingMode);
-}
-//! [editContact() function]
-void AddressBook::editContact()
-{
-    oldName = nameLine->text();
-    oldAddress = addressText->toPlainText();
-
-    updateInterface(EditingMode);
-}
-//! [editContact() function]
-//! [submitContact() function beginning]
-void AddressBook::submitContact()
-{
-//! [submitContact() function beginning]
-    QString name = nameLine->text();
-    QString address = addressText->toPlainText();
-
-    if (name.isEmpty() || address.isEmpty()) {
-        QMessageBox::information(this, tr("Empty Field"),
-            tr("Please enter a name and address."));
-	return;
-    }
-//! [submitContact() function part1]
-    if (currentMode == AddingMode) {
-        
-        if (!contacts.contains(name)) {
-            contacts.insert(name, address);
-            QMessageBox::information(this, tr("Add Successful"),
-                tr("\"%1\" has been added to your address book.").arg(name));
-        } else {
-            QMessageBox::information(this, tr("Add Unsuccessful"),
-                tr("Sorry, \"%1\" is already in your address book.").arg(name));
-        }
-//! [submitContact() function part1]
-//! [submitContact() function part2]
-    } else if (currentMode == EditingMode) {
-        
-        if (oldName != name) {
-            if (!contacts.contains(name)) {
-                QMessageBox::information(this, tr("Edit Successful"),
-                    tr("\"%1\" has been edited in your address book.").arg(oldName));
-                contacts.remove(oldName);
-                contacts.insert(name, address);
-            } else {
-                QMessageBox::information(this, tr("Edit Unsuccessful"),
-                    tr("Sorry, \"%1\" is already in your address book.").arg(name));
-            }
-        } else if (oldAddress != address) {
-            QMessageBox::information(this, tr("Edit Successful"),
-                tr("\"%1\" has been edited in your address book.").arg(name));
-            contacts[name] = address;        
-        }
-    }
-
-    updateInterface(NavigationMode);
-}
-//! [submitContact() function part2]
-
-void AddressBook::cancel()
-{
-    nameLine->setText(oldName);
-    addressText->setText(oldAddress);
-    updateInterface(NavigationMode);
-}
-//! [removeContact() function]
-void AddressBook::removeContact()
-{
-    QString name = nameLine->text();
-    QString address = addressText->toPlainText();
-
-    if (contacts.contains(name)) {
-
-        int button = QMessageBox::question(this,
-            tr("Confirm Remove"),
-            tr("Are you sure you want to remove \"%1\"?").arg(name),
-            QMessageBox::Yes | QMessageBox::No);
-
-        if (button == QMessageBox::Yes) {
-            
-            previous();
-            contacts.remove(name);
-
-            QMessageBox::information(this, tr("Remove Successful"),
-                tr("\"%1\" has been removed from your address book.").arg(name));
-        }
-    }
-
-    updateInterface(NavigationMode);
-}
-//! [removeContact() function]
-void AddressBook::next()
-{
-    QString name = nameLine->text();
-    QMap<QString, QString>::iterator i = contacts.find(name);
-
-    if (i != contacts.end())
-        i++;
-
-    if (i == contacts.end())
-        i = contacts.begin();
-
-    nameLine->setText(i.key());
-    addressText->setText(i.value());
-}
-
-void AddressBook::previous()
-{
-    QString name = nameLine->text();
-    QMap<QString, QString>::iterator i = contacts.find(name);
-
-    if (i == contacts.end()) {
-        nameLine->clear();
-        addressText->clear();
-        return;
-    }
-
-    if (i == contacts.begin())
-        i = contacts.end();
-
-    i--;
-    nameLine->setText(i.key());
-    addressText->setText(i.value());
-}
-//! [update interface() part 1]
-void AddressBook::updateInterface(Mode mode)
-{
-    currentMode = mode;
-
-    switch (currentMode) {
-        
-    case AddingMode:
-    case EditingMode:
-
-        nameLine->setReadOnly(false);
-        nameLine->setFocus(Qt::OtherFocusReason);
-        addressText->setReadOnly(false);
-
-        addButton->setEnabled(false);
-        editButton->setEnabled(false);
-        removeButton->setEnabled(false);
-
-        nextButton->setEnabled(false);
-        previousButton->setEnabled(false);
-
-        submitButton->show();
-        cancelButton->show();
-        break;
-//! [update interface() part 1]
-//! [update interface() part 2]
-    case NavigationMode:
-
-        if (contacts.isEmpty()) {
-            nameLine->clear();
-            addressText->clear();
-        }
-
-        nameLine->setReadOnly(true);
-        addressText->setReadOnly(true);
-        addButton->setEnabled(true);
-
-        int number = contacts.size();
-        editButton->setEnabled(number >= 1);
-        removeButton->setEnabled(number >= 1);
-        nextButton->setEnabled(number > 1);
-        previousButton->setEnabled(number >1 );
-
-        submitButton->hide();
-        cancelButton->hide();
-        break;
-    }
-}
-//! [update interface() part 2]
diff --git a/examples/tutorials/addressbook-fr/part4/addressbook.h b/examples/tutorials/addressbook-fr/part4/addressbook.h
deleted file mode 100644
index ddf03c217e..0000000000
--- a/examples/tutorials/addressbook-fr/part4/addressbook.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef ADDRESSBOOK_H
-#define ADDRESSBOOK_H
-
-#include <QWidget>
-#include <QMap>
-
-QT_BEGIN_NAMESPACE
-class QPushButton;
-class QLabel;
-class QLineEdit;
-class QTextEdit;
-QT_END_NAMESPACE
-
-class AddressBook : public QWidget
-{
-    Q_OBJECT
-
-public:
-    AddressBook(QWidget *parent = 0);
-//! [Mode enum]
-    enum Mode { NavigationMode, AddingMode, EditingMode };
-//! [Mode enum]
-
-public slots:
-    void addContact();
-    void submitContact();
-    void cancel();
-//! [edit and remove slots]
-    void editContact();
-    void removeContact();
-//! [edit and remove slots]
-    void next();
-    void previous();
-
-private:
-//! [updateInterface() declaration]
-    void updateInterface(Mode mode);
-//! [updateInterface() declaration]
-    QPushButton *addButton;
-//! [buttons declaration]    
-    QPushButton *editButton;
-    QPushButton *removeButton;
-//! [buttons declaration]        
-    QPushButton *submitButton;
-    QPushButton *cancelButton;
-    QPushButton *nextButton;
-    QPushButton *previousButton;
-    QLineEdit *nameLine;
-    QTextEdit *addressText;
-
-    QMap<QString, QString> contacts;
-    QString oldName;
-    QString oldAddress;
-//! [mode declaration]    
-    Mode currentMode;
-//! [mode declaration]    
-};
-
-#endif
diff --git a/examples/tutorials/addressbook-fr/part4/main.cpp b/examples/tutorials/addressbook-fr/part4/main.cpp
deleted file mode 100644
index 663fbb7d09..0000000000
--- a/examples/tutorials/addressbook-fr/part4/main.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "addressbook.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    AddressBook addressBook;
-    addressBook.show();
-
-    return app.exec();
-}
diff --git a/examples/tutorials/addressbook-fr/part4/part4.desktop b/examples/tutorials/addressbook-fr/part4/part4.desktop
deleted file mode 100644
index 7726989689..0000000000
--- a/examples/tutorials/addressbook-fr/part4/part4.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=4 Address Book FR
-Exec=/opt/usr/bin/part4
-Icon=part4
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/tutorials/addressbook-fr/part4/part4.pro b/examples/tutorials/addressbook-fr/part4/part4.pro
deleted file mode 100644
index 1684d5e5f4..0000000000
--- a/examples/tutorials/addressbook-fr/part4/part4.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-SOURCES = addressbook.cpp \
-          main.cpp
-HEADERS = addressbook.h
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part4
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part4.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part4
-INSTALLS += target sources
-QT += widgets
-
-
-simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/tutorials/addressbook-fr/part5/addressbook.cpp b/examples/tutorials/addressbook-fr/part5/addressbook.cpp
deleted file mode 100644
index 63aac8495e..0000000000
--- a/examples/tutorials/addressbook-fr/part5/addressbook.cpp
+++ /dev/null
@@ -1,312 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "addressbook.h"
-
-AddressBook::AddressBook(QWidget *parent)
-    : QWidget(parent)
-{
-    QLabel *nameLabel = new QLabel(tr("Name:"));
-    nameLine = new QLineEdit;
-    nameLine->setReadOnly(true);
-
-    QLabel *addressLabel = new QLabel(tr("Address:"));
-    addressText = new QTextEdit;
-    addressText->setReadOnly(true);
-
-    addButton = new QPushButton(tr("&Add"));
-
-    editButton = new QPushButton(tr("&Edit"));
-    editButton->setEnabled(false);
-    removeButton = new QPushButton(tr("&Remove"));
-    removeButton->setEnabled(false);
-//! [instantiating findButton]
-    findButton = new QPushButton(tr("&Find"));
-    findButton->setEnabled(false);
-//! [instantiating findButton]
-    submitButton = new QPushButton(tr("&Submit"));
-    submitButton->hide();
-    cancelButton = new QPushButton(tr("&Cancel"));
-    cancelButton->hide();
-
-    nextButton = new QPushButton(tr("&Next"));
-    nextButton->setEnabled(false);
-    previousButton = new QPushButton(tr("&Previous"));
-    previousButton->setEnabled(false);
-
-//! [instantiating FindDialog]
-    dialog = new FindDialog;
-//! [instantiating FindDialog]
-
-    connect(addButton, SIGNAL(clicked()), this, SLOT(addContact()));
-    connect(submitButton, SIGNAL(clicked()), this, SLOT(submitContact()));
-    connect(editButton, SIGNAL(clicked()), this, SLOT(editContact()));
-    connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
-    connect(removeButton, SIGNAL(clicked()), this, SLOT(removeContact()));
-//! [signals and slots for find]    
-    connect(findButton, SIGNAL(clicked()), this, SLOT(findContact()));
-//! [signals and slots for find]        
-    connect(nextButton, SIGNAL(clicked()), this, SLOT(next()));
-    connect(previousButton, SIGNAL(clicked()), this, SLOT(previous()));
-    
-    QVBoxLayout *buttonLayout1 = new QVBoxLayout;
-    buttonLayout1->addWidget(addButton);
-    buttonLayout1->addWidget(editButton);
-    buttonLayout1->addWidget(removeButton);
-//! [adding findButton to layout]        
-    buttonLayout1->addWidget(findButton);
-//! [adding findButton to layout]            
-    buttonLayout1->addWidget(submitButton);
-    buttonLayout1->addWidget(cancelButton);
-    buttonLayout1->addStretch();
-
-    QHBoxLayout *buttonLayout2 = new QHBoxLayout;
-    buttonLayout2->addWidget(previousButton);
-    buttonLayout2->addWidget(nextButton);
-
-    QGridLayout *mainLayout = new QGridLayout;
-    mainLayout->addWidget(nameLabel, 0, 0);
-    mainLayout->addWidget(nameLine, 0, 1);
-    mainLayout->addWidget(addressLabel, 1, 0, Qt::AlignTop);
-    mainLayout->addWidget(addressText, 1, 1);
-    mainLayout->addLayout(buttonLayout1, 1, 2);
-    mainLayout->addLayout(buttonLayout2, 2, 1);
-
-    setLayout(mainLayout);
-    setWindowTitle(tr("Simple Address Book"));
-}
-
-void AddressBook::addContact()
-{
-    oldName = nameLine->text();
-    oldAddress = addressText->toPlainText();
-
-    nameLine->clear();
-    addressText->clear();
-
-    updateInterface(AddingMode);
-}
-
-void AddressBook::editContact()
-{
-    oldName = nameLine->text();
-    oldAddress = addressText->toPlainText();
-
-    updateInterface(EditingMode);
-}
-
-void AddressBook::submitContact()
-{
-    QString name = nameLine->text();
-    QString address = addressText->toPlainText();
-
-    if (name.isEmpty() || address.isEmpty()) {
-        QMessageBox::information(this, tr("Empty Field"),
-            tr("Please enter a name and address."));
-   	return;
-   }
-
-    if (currentMode == AddingMode) {
-        
-        if (!contacts.contains(name)) {
-            contacts.insert(name, address);
-            QMessageBox::information(this, tr("Add Successful"),
-                tr("\"%1\" has been added to your address book.").arg(name));
-        } else {
-            QMessageBox::information(this, tr("Add Unsuccessful"),
-                tr("Sorry, \"%1\" is already in your address book.").arg(name));
-        }
-    } else if (currentMode == EditingMode) {
-        
-        if (oldName != name) {
-            if (!contacts.contains(name)) {
-                QMessageBox::information(this, tr("Edit Successful"),
-                    tr("\"%1\" has been edited in your address book.").arg(oldName));
-                contacts.remove(oldName);
-                contacts.insert(name, address);
-            } else {
-                QMessageBox::information(this, tr("Edit Unsuccessful"),
-                    tr("Sorry, \"%1\" is already in your address book.").arg(name));
-            }
-        } else if (oldAddress != address) {
-            QMessageBox::information(this, tr("Edit Successful"),
-                tr("\"%1\" has been edited in your address book.").arg(name));
-            contacts[name] = address;
-        }
-    }
-
-    updateInterface(NavigationMode);
-}
-
-void AddressBook::cancel()
-{
-    nameLine->setText(oldName);
-    addressText->setText(oldAddress);
-    updateInterface(NavigationMode);
-}
-
-void AddressBook::removeContact()
-{
-    QString name = nameLine->text();
-    QString address = addressText->toPlainText();
-
-    if (contacts.contains(name)) {
-
-        int button = QMessageBox::question(this,
-            tr("Confirm Remove"),
-            tr("Are you sure you want to remove \"%1\"?").arg(name),
-            QMessageBox::Yes | QMessageBox::No);
-
-        if (button == QMessageBox::Yes) {
-            
-            previous();
-            contacts.remove(name);
-
-            QMessageBox::information(this, tr("Remove Successful"),
-                tr("\"%1\" has been removed from your address book.").arg(name));
-        }
-    }
-
-    updateInterface(NavigationMode);
-}
-
-void AddressBook::next()
-{
-    QString name = nameLine->text();
-    QMap<QString, QString>::iterator i = contacts.find(name);
-
-    if (i != contacts.end())
-        i++;
-
-    if (i == contacts.end())
-        i = contacts.begin();
-
-    nameLine->setText(i.key());
-    addressText->setText(i.value());
-}
-
-void AddressBook::previous()
-{
-    QString name = nameLine->text();
-    QMap<QString, QString>::iterator i = contacts.find(name);
-
-    if (i == contacts.end()) {
-        nameLine->clear();
-        addressText->clear();
-        return;
-    }
-
-    if (i == contacts.begin())
-        i = contacts.end();
-
-    i--;
-    nameLine->setText(i.key());
-    addressText->setText(i.value());
-}
-//! [findContact() function] 
-void AddressBook::findContact()
-{
-    dialog->show();
-
-    if (dialog->exec() == QDialog::Accepted) {
-        QString contactName = dialog->getFindText();
-
-        if (contacts.contains(contactName)) {
-            nameLine->setText(contactName);
-            addressText->setText(contacts.value(contactName));
-        } else {
-            QMessageBox::information(this, tr("Contact Not Found"),
-                tr("Sorry, \"%1\" is not in your address book.").arg(contactName));
-            return;
-        }
-    }
-
-    updateInterface(NavigationMode);
-}
-//! [findContact() function] 
-
-void AddressBook::updateInterface(Mode mode)
-{
-    currentMode = mode;
-
-    switch (currentMode) {
-
-    case AddingMode:
-    case EditingMode:
-
-        nameLine->setReadOnly(false);
-        nameLine->setFocus(Qt::OtherFocusReason);
-        addressText->setReadOnly(false);
-
-        addButton->setEnabled(false);
-        editButton->setEnabled(false);
-        removeButton->setEnabled(false);
-
-        nextButton->setEnabled(false);
-        previousButton->setEnabled(false);
-
-        submitButton->show();
-        cancelButton->show();
-        break;
-
-    case NavigationMode:
-        
-        if (contacts.isEmpty()) {
-            nameLine->clear();
-            addressText->clear();
-        }
-
-        nameLine->setReadOnly(true);
-        addressText->setReadOnly(true);
-        addButton->setEnabled(true);
-
-        int number = contacts.size();
-        editButton->setEnabled(number >= 1);
-        removeButton->setEnabled(number >= 1);
-        findButton->setEnabled(number > 2);
-        nextButton->setEnabled(number > 1);
-        previousButton->setEnabled(number > 1);
-
-        submitButton->hide();
-        cancelButton->hide();
-        break;
-    }
-}
diff --git a/examples/tutorials/addressbook-fr/part5/addressbook.h b/examples/tutorials/addressbook-fr/part5/addressbook.h
deleted file mode 100644
index 5d58952037..0000000000
--- a/examples/tutorials/addressbook-fr/part5/addressbook.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef ADDRESSBOOK_H
-#define ADDRESSBOOK_H
-
-#include <QWidget>
-#include <QMap>
-//! [include finddialog's header]
-#include "finddialog.h"
-//! [include finddialog's header]
-QT_BEGIN_NAMESPACE
-class QPushButton;
-class QLabel;
-class QLineEdit;
-class QTextEdit;
-QT_END_NAMESPACE
-
-
-class AddressBook : public QWidget
-{
-    Q_OBJECT
-
-public:
-    AddressBook(QWidget *parent = 0);
-    enum Mode { NavigationMode, AddingMode, EditingMode };
-
-public slots:
-    void addContact();
-    void editContact();
-    void submitContact();
-    void cancel();
-    void removeContact();
-//! [findContact() declaration]    
-    void findContact();
-//! [findContact() declaration]    
-    void next();
-    void previous();
-
-private:
-    void updateInterface(Mode mode);
-
-    QPushButton *addButton;
-    QPushButton *editButton;
-    QPushButton *removeButton;
-//! [findButton declaration]        
-    QPushButton *findButton;
-//! [findButton declaration] 
-    QPushButton *submitButton;
-    QPushButton *cancelButton;
-    QPushButton *nextButton;
-    QPushButton *previousButton;
-    QLineEdit *nameLine;
-    QTextEdit *addressText;
-
-    QMap<QString, QString> contacts;
-//! [FindDialog declaration]     
-    FindDialog *dialog;
-//! [FindDialog declaration]     
-    QString oldName;
-    QString oldAddress;
-    Mode currentMode;
-};
-
-#endif
diff --git a/examples/tutorials/addressbook-fr/part5/finddialog.cpp b/examples/tutorials/addressbook-fr/part5/finddialog.cpp
deleted file mode 100644
index fdeab4c4bb..0000000000
--- a/examples/tutorials/addressbook-fr/part5/finddialog.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "finddialog.h"
-
-//! [constructor]
-FindDialog::FindDialog(QWidget *parent)
-    : QDialog(parent)
-{
-    QLabel *findLabel = new QLabel(tr("Enter the name of a contact:"));
-    lineEdit = new QLineEdit;
-
-    findButton = new QPushButton(tr("&Find"));
-    findText = "";
-
-    QHBoxLayout *layout = new QHBoxLayout;
-    layout->addWidget(findLabel);
-    layout->addWidget(lineEdit);
-    layout->addWidget(findButton);
-
-    setLayout(layout);
-    setWindowTitle(tr("Find a Contact"));
-    connect(findButton, SIGNAL(clicked()), this, SLOT(findClicked()));
-    connect(findButton, SIGNAL(clicked()), this, SLOT(accept()));
-}
-//! [constructor]
-//! [findClicked() function]
-void FindDialog::findClicked()
-{
-    QString text = lineEdit->text();
-
-    if (text.isEmpty()) {
-        QMessageBox::information(this, tr("Empty Field"),
-            tr("Please enter a name."));
-        return;
-    } else {
-        findText = text;
-        lineEdit->clear();
-        hide();
-    }
-}
-//! [findClicked() function]
-//! [getFindText() function]
-QString FindDialog::getFindText()
-{
-    return findText;
-}
-//! [getFindText() function]
diff --git a/examples/tutorials/addressbook-fr/part5/finddialog.h b/examples/tutorials/addressbook-fr/part5/finddialog.h
deleted file mode 100644
index 2ebaef1d86..0000000000
--- a/examples/tutorials/addressbook-fr/part5/finddialog.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef FINDDIALOG_H
-#define FINDDIALOG_H
-//! [FindDialog header]
-#include <QDialog>
-
-QT_BEGIN_NAMESPACE
-class QLineEdit;
-class QPushButton;
-QT_END_NAMESPACE
-
-class FindDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    FindDialog(QWidget *parent = 0);
-    QString getFindText();
-
-public slots:
-    void findClicked();
-
-private:
-    QPushButton *findButton;
-    QLineEdit *lineEdit;
-    QString findText;
-};
-//! [FindDialog header]
-#endif
diff --git a/examples/tutorials/addressbook-fr/part5/main.cpp b/examples/tutorials/addressbook-fr/part5/main.cpp
deleted file mode 100644
index 663fbb7d09..0000000000
--- a/examples/tutorials/addressbook-fr/part5/main.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "addressbook.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    AddressBook addressBook;
-    addressBook.show();
-
-    return app.exec();
-}
diff --git a/examples/tutorials/addressbook-fr/part5/part5.desktop b/examples/tutorials/addressbook-fr/part5/part5.desktop
deleted file mode 100644
index 0efcb1550c..0000000000
--- a/examples/tutorials/addressbook-fr/part5/part5.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=5 Address Book FR
-Exec=/opt/usr/bin/part5
-Icon=part5
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/tutorials/addressbook-fr/part5/part5.pro b/examples/tutorials/addressbook-fr/part5/part5.pro
deleted file mode 100644
index 1978068cc7..0000000000
--- a/examples/tutorials/addressbook-fr/part5/part5.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-SOURCES   = addressbook.cpp \
-            finddialog.cpp \
-            main.cpp
-HEADERS   = addressbook.h \
-            finddialog.h
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part5
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part5.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part5
-INSTALLS += target sources
-QT += widgets
-
-
-simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/tutorials/addressbook-fr/part6/addressbook.cpp b/examples/tutorials/addressbook-fr/part6/addressbook.cpp
deleted file mode 100644
index ff2756d4bb..0000000000
--- a/examples/tutorials/addressbook-fr/part6/addressbook.cpp
+++ /dev/null
@@ -1,393 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "addressbook.h"
-
-AddressBook::AddressBook(QWidget *parent)
-    : QWidget(parent)
-{
-    QLabel *nameLabel = new QLabel(tr("Name:"));
-    nameLine = new QLineEdit;
-    nameLine->setReadOnly(true);
-
-    QLabel *addressLabel = new QLabel(tr("Address:"));
-    addressText = new QTextEdit;
-    addressText->setReadOnly(true);
-
-    addButton = new QPushButton(tr("&Add"));
-
-    editButton = new QPushButton(tr("&Edit"));
-    editButton->setEnabled(false);
-    removeButton = new QPushButton(tr("&Remove"));
-    removeButton->setEnabled(false);
-    findButton = new QPushButton(tr("&Find"));
-    findButton->setEnabled(false);
-    submitButton = new QPushButton(tr("&Submit"));
-    submitButton->hide();
-    cancelButton = new QPushButton(tr("&Cancel"));
-    cancelButton->hide();
-
-    nextButton = new QPushButton(tr("&Next"));
-    nextButton->setEnabled(false);
-    previousButton = new QPushButton(tr("&Previous"));
-    previousButton->setEnabled(false);
-
-    loadButton = new QPushButton(tr("&Load..."));
-//! [tooltip 1]    
-    loadButton->setToolTip(tr("Load contacts from a file"));
-//! [tooltip 1]        
-    saveButton = new QPushButton(tr("Sa&ve..."));
-//! [tooltip 2]
-    saveButton->setToolTip(tr("Save contacts to a file"));
-//! [tooltip 2]
-    saveButton->setEnabled(false);
-
-    dialog = new FindDialog;
-
-    connect(addButton, SIGNAL(clicked()), this, SLOT(addContact()));
-    connect(submitButton, SIGNAL(clicked()), this, SLOT(submitContact()));
-    connect(editButton, SIGNAL(clicked()), this, SLOT(editContact()));
-    connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
-    connect(removeButton, SIGNAL(clicked()), this, SLOT(removeContact()));
-    connect(findButton, SIGNAL(clicked()), this, SLOT(findContact()));
-    connect(nextButton, SIGNAL(clicked()), this, SLOT(next()));
-    connect(previousButton, SIGNAL(clicked()), this, SLOT(previous()));
-    connect(loadButton, SIGNAL(clicked()), this, SLOT(loadFromFile()));
-    connect(saveButton, SIGNAL(clicked()), this, SLOT(saveToFile()));
-    
-    QVBoxLayout *buttonLayout1 = new QVBoxLayout;
-    buttonLayout1->addWidget(addButton);
-    buttonLayout1->addWidget(editButton);
-    buttonLayout1->addWidget(removeButton);
-    buttonLayout1->addWidget(findButton);
-    buttonLayout1->addWidget(submitButton);
-    buttonLayout1->addWidget(cancelButton);
-    buttonLayout1->addWidget(loadButton);
-    buttonLayout1->addWidget(saveButton);
-    buttonLayout1->addStretch();
-
-    QHBoxLayout *buttonLayout2 = new QHBoxLayout;
-    buttonLayout2->addWidget(previousButton);
-    buttonLayout2->addWidget(nextButton);
-
-    QGridLayout *mainLayout = new QGridLayout;
-    mainLayout->addWidget(nameLabel, 0, 0);
-    mainLayout->addWidget(nameLine, 0, 1);
-    mainLayout->addWidget(addressLabel, 1, 0, Qt::AlignTop);
-    mainLayout->addWidget(addressText, 1, 1);
-    mainLayout->addLayout(buttonLayout1, 1, 2);
-    mainLayout->addLayout(buttonLayout2, 2, 1);
-
-    setLayout(mainLayout);
-    setWindowTitle(tr("Simple Address Book"));
-}
-
-void AddressBook::addContact()
-{
-    oldName = nameLine->text();
-    oldAddress = addressText->toPlainText();
-
-    nameLine->clear();
-    addressText->clear();
-
-    updateInterface(AddingMode);
-}
-
-void AddressBook::editContact()
-{
-    oldName = nameLine->text();
-    oldAddress = addressText->toPlainText();
-
-    updateInterface(EditingMode);
-}
-
-void AddressBook::submitContact()
-{
-    QString name = nameLine->text();
-    QString address = addressText->toPlainText();
-
-    if (name.isEmpty() || address.isEmpty()) {
-        QMessageBox::information(this, tr("Empty Field"),
-            tr("Please enter a name and address."));
-	return;
-    }
-
-    if (currentMode == AddingMode) {
-        
-        if (!contacts.contains(name)) {
-            contacts.insert(name, address);
-            QMessageBox::information(this, tr("Add Successful"),
-                tr("\"%1\" has been added to your address book.").arg(name));
-        } else {
-            QMessageBox::information(this, tr("Add Unsuccessful"),
-                tr("Sorry, \"%1\" is already in your address book.").arg(name));
-        }
-    } else if (currentMode == EditingMode) {
-        
-        if (oldName != name) {
-            if (!contacts.contains(name)) {
-                QMessageBox::information(this, tr("Edit Successful"),
-                    tr("\"%1\" has been edited in your address book.").arg(oldName));
-                contacts.remove(oldName);
-                contacts.insert(name, address);
-            } else {
-                QMessageBox::information(this, tr("Edit Unsuccessful"),
-                    tr("Sorry, \"%1\" is already in your address book.").arg(name));
-            }
-        } else if (oldAddress != address) {
-            QMessageBox::information(this, tr("Edit Successful"),
-                tr("\"%1\" has been edited in your address book.").arg(name));
-            contacts[name] = address;
-        }
-    }
-
-    updateInterface(NavigationMode);
-}
-
-void AddressBook::cancel()
-{
-    nameLine->setText(oldName);
-    addressText->setText(oldAddress);
-    updateInterface(NavigationMode);
-}
-
-void AddressBook::removeContact()
-{
-    QString name = nameLine->text();
-    QString address = addressText->toPlainText();
-
-    if (contacts.contains(name)) {
-
-        int button = QMessageBox::question(this,
-            tr("Confirm Remove"),
-            tr("Are you sure you want to remove \"%1\"?").arg(name),
-            QMessageBox::Yes | QMessageBox::No);
-
-        if (button == QMessageBox::Yes) {
-            
-            previous();
-            contacts.remove(name);
-
-            QMessageBox::information(this, tr("Remove Successful"),
-                tr("\"%1\" has been removed from your address book.").arg(name));
-        }
-    }
-
-    updateInterface(NavigationMode);
-}
-
-void AddressBook::next()
-{
-    QString name = nameLine->text();
-    QMap<QString, QString>::iterator i = contacts.find(name);
-
-    if (i != contacts.end())
-        i++;
-
-    if (i == contacts.end())
-        i = contacts.begin();
-
-    nameLine->setText(i.key());
-    addressText->setText(i.value());
-}
-
-void AddressBook::previous()
-{
-    QString name = nameLine->text();
-    QMap<QString, QString>::iterator i = contacts.find(name);
-
-    if (i == contacts.end()) {
-        nameLine->clear();
-        addressText->clear();
-        return;
-    }
-
-    if (i == contacts.begin())
-        i = contacts.end();
-
-    i--;
-    nameLine->setText(i.key());
-    addressText->setText(i.value());
-}
-
-void AddressBook::findContact()
-{
-    dialog->show();
-
-    if (dialog->exec() == 1) {
-        QString contactName = dialog->getFindText();
-
-        if (contacts.contains(contactName)) {
-            nameLine->setText(contactName);
-            addressText->setText(contacts.value(contactName));
-        } else {
-            QMessageBox::information(this, tr("Contact Not Found"),
-                tr("Sorry, \"%1\" is not in your address book.").arg(contactName));
-            return;
-        }
-    }
-
-    updateInterface(NavigationMode);
-}
-
-void AddressBook::updateInterface(Mode mode)
-{
-    currentMode = mode;
-
-    switch (currentMode) {
-
-    case AddingMode:
-    case EditingMode:
-
-        nameLine->setReadOnly(false);
-        nameLine->setFocus(Qt::OtherFocusReason);
-        addressText->setReadOnly(false);
-
-        addButton->setEnabled(false);
-        editButton->setEnabled(false);
-        removeButton->setEnabled(false);
-
-        nextButton->setEnabled(false);
-        previousButton->setEnabled(false);
-
-        submitButton->show();
-        cancelButton->show();
-
-        loadButton->setEnabled(false);
-        saveButton->setEnabled(false);
-        break;
-
-    case NavigationMode:
-        
-        if (contacts.isEmpty()) {
-            nameLine->clear();
-            addressText->clear();
-        }
-
-        nameLine->setReadOnly(true);
-        addressText->setReadOnly(true);
-        addButton->setEnabled(true);
-
-        int number = contacts.size();
-        editButton->setEnabled(number >= 1);
-        removeButton->setEnabled(number >= 1);
-        findButton->setEnabled(number > 2);
-        nextButton->setEnabled(number > 1);
-        previousButton->setEnabled(number > 1);
-
-        submitButton->hide();
-        cancelButton->hide();
-
-        loadButton->setEnabled(true);
-        saveButton->setEnabled(number >= 1);
-        break;
-    }
-}
-
-//! [saveToFile() function part1]
-void AddressBook::saveToFile()
-{
-    QString fileName = QFileDialog::getSaveFileName(this,
-        tr("Save Address Book"), "",
-        tr("Address Book (*.abk);;All Files (*)"));
-
-//! [saveToFile() function part1]
-//! [saveToFile() function part2]
-    if (fileName.isEmpty())
-        return;
-    else {
-        QFile file(fileName);
-        if (!file.open(QIODevice::WriteOnly)) {
-            QMessageBox::information(this, tr("Unable to open file"),
-                file.errorString());
-            return;
-        }
-
-//! [saveToFile() function part2]        
-//! [saveToFile() function part3]
-        QDataStream out(&file);
-        out.setVersion(QDataStream::Qt_4_5);
-        out << contacts;
-    }       
-}
-//! [saveToFile() function part3]
-
-//! [loadFromFile() function part1]
-void AddressBook::loadFromFile()
-{
-    QString fileName = QFileDialog::getOpenFileName(this,
-        tr("Open Address Book"), "",
-        tr("Address Book (*.abk);;All Files (*)"));
-//! [loadFromFile() function part1]
-
-//! [loadFromFile() function part2]
-    if (fileName.isEmpty())
-        return;
-    else {
-        
-        QFile file(fileName);
-        
-        if (!file.open(QIODevice::ReadOnly)) {
-            QMessageBox::information(this, tr("Unable to open file"),
-                file.errorString());
-            return;
-        }
-        
-        QDataStream in(&file);
-        in.setVersion(QDataStream::Qt_4_5);
-        contacts.empty();   // empty existing contacts
-        in >> contacts;
-//! [loadFromFile() function part2]
-
-//! [loadFromFile() function part3]
-        if (contacts.isEmpty()) {
-            QMessageBox::information(this, tr("No contacts in file"),
-                tr("The file you are attempting to open contains no contacts."));
-        } else {
-            QMap<QString, QString>::iterator i = contacts.begin();
-            nameLine->setText(i.key());
-            addressText->setText(i.value());
-        }
-    }
-
-    updateInterface(NavigationMode);
-}
-//! [loadFromFile() function part3]
diff --git a/examples/tutorials/addressbook-fr/part6/addressbook.h b/examples/tutorials/addressbook-fr/part6/addressbook.h
deleted file mode 100644
index 59a8b9951d..0000000000
--- a/examples/tutorials/addressbook-fr/part6/addressbook.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef ADDRESSBOOK_H
-#define ADDRESSBOOK_H
-
-#include <QWidget>
-#include <QMap>
-#include "finddialog.h"
-
-QT_BEGIN_NAMESPACE
-class QPushButton;
-class QLabel;
-class QLineEdit;
-class QTextEdit;
-QT_END_NAMESPACE
-
-
-class AddressBook : public QWidget
-{
-    Q_OBJECT
-
-public:
-    AddressBook(QWidget *parent = 0);
-    enum Mode { NavigationMode, AddingMode, EditingMode };
-
-public slots:
-    void addContact();
-    void editContact();
-    void submitContact();
-    void cancel();
-    void removeContact();
-    void findContact();
-    void next();
-    void previous();
-//! [save and load functions declaration]    
-    void saveToFile();
-    void loadFromFile();
-//! [save and load functions declaration]    
-
-private:
-    void updateInterface(Mode mode);
-
-    QPushButton *addButton;
-    QPushButton *editButton;
-    QPushButton *removeButton;
-    QPushButton *findButton;
-    QPushButton *submitButton;
-    QPushButton *cancelButton;
-    QPushButton *nextButton;
-    QPushButton *previousButton;
-//! [save and load buttons declaration]        
-    QPushButton *loadButton;
-    QPushButton *saveButton;
-//! [save and load buttons declaration]            
-    QLineEdit *nameLine;
-    QTextEdit *addressText;
-
-    QMap<QString, QString> contacts;
-    FindDialog *dialog;
-    QString oldName;
-    QString oldAddress;
-    Mode currentMode;
-};
-
-#endif
diff --git a/examples/tutorials/addressbook-fr/part6/finddialog.cpp b/examples/tutorials/addressbook-fr/part6/finddialog.cpp
deleted file mode 100644
index 686af08c71..0000000000
--- a/examples/tutorials/addressbook-fr/part6/finddialog.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "finddialog.h"
-
-FindDialog::FindDialog(QWidget *parent)
-    : QDialog(parent)
-{
-    QLabel *findLabel = new QLabel(tr("Enter the name of a contact:"));
-    lineEdit = new QLineEdit;
-
-    findButton = new QPushButton(tr("&Find"));
-    findText = "";
-
-    QHBoxLayout *layout = new QHBoxLayout;
-    layout->addWidget(findLabel);
-    layout->addWidget(lineEdit);
-    layout->addWidget(findButton);
-
-    setLayout(layout);
-    setWindowTitle(tr("Find a Contact"));
-    connect(findButton, SIGNAL(clicked()), this, SLOT(findClicked()));
-    connect(findButton, SIGNAL(clicked()), this, SLOT(accept()));
-}
-
-void FindDialog::findClicked()
-{
-    QString text = lineEdit->text();
-
-    if (text.isEmpty()) {
-        QMessageBox::information(this, tr("Empty Field"),
-            tr("Please enter a name."));
-        return;
-    } else {
-        findText = text;
-        lineEdit->clear();
-        hide();
-    }
-}
-
-QString FindDialog::getFindText()
-{
-    return findText;
-}
diff --git a/examples/tutorials/addressbook-fr/part6/finddialog.h b/examples/tutorials/addressbook-fr/part6/finddialog.h
deleted file mode 100644
index 86a33bbb72..0000000000
--- a/examples/tutorials/addressbook-fr/part6/finddialog.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef FINDDIALOG_H
-#define FINDDIALOG_H
-
-#include <QDialog>
-
-QT_BEGIN_NAMESPACE
-class QLineEdit;
-class QPushButton;
-QT_END_NAMESPACE
-
-class FindDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    FindDialog(QWidget *parent = 0);
-    QString getFindText();
-
-public slots:
-    void findClicked();
-
-private:
-    QPushButton *findButton;
-    QLineEdit *lineEdit;
-    QString findText;
-};
-
-#endif
diff --git a/examples/tutorials/addressbook-fr/part6/main.cpp b/examples/tutorials/addressbook-fr/part6/main.cpp
deleted file mode 100644
index 663fbb7d09..0000000000
--- a/examples/tutorials/addressbook-fr/part6/main.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "addressbook.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    AddressBook addressBook;
-    addressBook.show();
-
-    return app.exec();
-}
diff --git a/examples/tutorials/addressbook-fr/part6/part6.desktop b/examples/tutorials/addressbook-fr/part6/part6.desktop
deleted file mode 100644
index 144025924a..0000000000
--- a/examples/tutorials/addressbook-fr/part6/part6.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=6 Address Book FR
-Exec=/opt/usr/bin/part6
-Icon=part6
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/tutorials/addressbook-fr/part6/part6.pro b/examples/tutorials/addressbook-fr/part6/part6.pro
deleted file mode 100644
index b5ec9569a8..0000000000
--- a/examples/tutorials/addressbook-fr/part6/part6.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-SOURCES   = addressbook.cpp \
-            finddialog.cpp \
-            main.cpp
-HEADERS   = addressbook.h \
-            finddialog.h
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part6
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part6.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part6
-INSTALLS += target sources
-QT += widgets
-
-
-simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/tutorials/addressbook-fr/part7/addressbook.cpp b/examples/tutorials/addressbook-fr/part7/addressbook.cpp
deleted file mode 100644
index a958108885..0000000000
--- a/examples/tutorials/addressbook-fr/part7/addressbook.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "addressbook.h"
-
-AddressBook::AddressBook(QWidget *parent)
-    : QWidget(parent)
-{
-    QLabel *nameLabel = new QLabel(tr("Name:"));
-    nameLine = new QLineEdit;
-    nameLine->setReadOnly(true);
-
-    QLabel *addressLabel = new QLabel(tr("Address:"));
-    addressText = new QTextEdit;
-    addressText->setReadOnly(true);
-
-    addButton = new QPushButton(tr("&Add"));
-
-    editButton = new QPushButton(tr("&Edit"));
-    editButton->setEnabled(false);
-    removeButton = new QPushButton(tr("&Remove"));
-    removeButton->setEnabled(false);
-    findButton = new QPushButton(tr("&Find"));
-    findButton->setEnabled(false);
-    submitButton = new QPushButton(tr("&Submit"));
-    submitButton->hide();
-    cancelButton = new QPushButton(tr("&Cancel"));
-    cancelButton->hide();
-
-    nextButton = new QPushButton(tr("&Next"));
-    nextButton->setEnabled(false);
-    previousButton = new QPushButton(tr("&Previous"));
-    previousButton->setEnabled(false);
-
-    loadButton = new QPushButton(tr("&Load..."));
-    loadButton->setToolTip(tr("Load contacts from a file"));
-    saveButton = new QPushButton(tr("Sa&ve..."));
-    saveButton->setToolTip(tr("Save contacts to a file"));
-    saveButton->setEnabled(false);
-
-    exportButton = new QPushButton(tr("E&xport"));
-    exportButton->setToolTip(tr("Export as vCard"));
-    exportButton->setEnabled(false);
-
-    dialog = new FindDialog;
-
-    connect(addButton, SIGNAL(clicked()), this, SLOT(addContact()));
-    connect(submitButton, SIGNAL(clicked()), this, SLOT(submitContact()));
-    connect(editButton, SIGNAL(clicked()), this, SLOT(editContact()));
-    connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
-    connect(removeButton, SIGNAL(clicked()), this, SLOT(removeContact()));
-    connect(findButton, SIGNAL(clicked()), this, SLOT(findContact()));
-    connect(nextButton, SIGNAL(clicked()), this, SLOT(next()));
-    connect(previousButton, SIGNAL(clicked()), this, SLOT(previous()));
-    connect(loadButton, SIGNAL(clicked()), this, SLOT(loadFromFile()));
-    connect(saveButton, SIGNAL(clicked()), this, SLOT(saveToFile()));
-    connect(exportButton, SIGNAL(clicked()), this, SLOT(exportAsVCard()));
-    
-    QVBoxLayout *buttonLayout1 = new QVBoxLayout;
-    buttonLayout1->addWidget(addButton);
-    buttonLayout1->addWidget(editButton);
-    buttonLayout1->addWidget(removeButton);
-    buttonLayout1->addWidget(findButton);
-    buttonLayout1->addWidget(submitButton);
-    buttonLayout1->addWidget(cancelButton);
-    buttonLayout1->addWidget(loadButton);
-    buttonLayout1->addWidget(saveButton);
-    buttonLayout1->addWidget(exportButton);
-    buttonLayout1->addStretch();
-
-    QHBoxLayout *buttonLayout2 = new QHBoxLayout;
-    buttonLayout2->addWidget(previousButton);
-    buttonLayout2->addWidget(nextButton);
-
-    QGridLayout *mainLayout = new QGridLayout;
-    mainLayout->addWidget(nameLabel, 0, 0);
-    mainLayout->addWidget(nameLine, 0, 1);
-    mainLayout->addWidget(addressLabel, 1, 0, Qt::AlignTop);
-    mainLayout->addWidget(addressText, 1, 1);
-    mainLayout->addLayout(buttonLayout1, 1, 2);
-    mainLayout->addLayout(buttonLayout2, 2, 1);
-
-    setLayout(mainLayout);
-    setWindowTitle(tr("Simple Address Book"));
-}
-
-void AddressBook::addContact()
-{
-    oldName = nameLine->text();
-    oldAddress = addressText->toPlainText();
-
-    nameLine->clear();
-    addressText->clear();
-
-    updateInterface(AddingMode);
-}
-
-void AddressBook::editContact()
-{
-    oldName = nameLine->text();
-    oldAddress = addressText->toPlainText();
-
-    updateInterface(EditingMode);
-}
-
-void AddressBook::submitContact()
-{
-    QString name = nameLine->text();
-    QString address = addressText->toPlainText();
-
-    if (name.isEmpty() || address.isEmpty()) {
-        QMessageBox::information(this, tr("Empty Field"),
-            tr("Please enter a name and address."));
-	return;
-    }
-
-    if (currentMode == AddingMode) {
-        
-        if (!contacts.contains(name)) {
-            contacts.insert(name, address);
-            QMessageBox::information(this, tr("Add Successful"),
-                tr("\"%1\" has been added to your address book.").arg(name));
-        } else {
-            QMessageBox::information(this, tr("Add Unsuccessful"),
-                tr("Sorry, \"%1\" is already in your address book.").arg(name));
-        }
-    } else if (currentMode == EditingMode) {
-        
-        if (oldName != name) {
-            if (!contacts.contains(name)) {
-                QMessageBox::information(this, tr("Edit Successful"),
-                    tr("\"%1\" has been edited in your address book.").arg(oldName));
-                contacts.remove(oldName);
-                contacts.insert(name, address);
-            } else {
-                QMessageBox::information(this, tr("Edit Unsuccessful"),
-                    tr("Sorry, \"%1\" is already in your address book.").arg(name));
-            }
-        } else if (oldAddress != address) {
-            QMessageBox::information(this, tr("Edit Successful"),
-                tr("\"%1\" has been edited in your address book.").arg(name));
-            contacts[name] = address;
-        }
-    }
-
-    updateInterface(NavigationMode);
-}
-
-void AddressBook::cancel()
-{
-    nameLine->setText(oldName);
-    addressText->setText(oldAddress);
-    updateInterface(NavigationMode);
-}
-
-void AddressBook::removeContact()
-{
-    QString name = nameLine->text();
-    QString address = addressText->toPlainText();
-
-    if (contacts.contains(name)) {
-
-        int button = QMessageBox::question(this,
-            tr("Confirm Remove"),
-            tr("Are you sure you want to remove \"%1\"?").arg(name),
-            QMessageBox::Yes | QMessageBox::No);
-
-        if (button == QMessageBox::Yes) {
-            
-            previous();
-            contacts.remove(name);
-
-            QMessageBox::information(this, tr("Remove Successful"),
-                tr("\"%1\" has been removed from your address book.").arg(name));
-        }
-    }
-
-    updateInterface(NavigationMode);
-}
-
-void AddressBook::next()
-{
-    QString name = nameLine->text();
-    QMap<QString, QString>::iterator i = contacts.find(name);
-
-    if (i != contacts.end())
-        i++;
-
-    if (i == contacts.end())
-        i = contacts.begin();
-
-    nameLine->setText(i.key());
-    addressText->setText(i.value());
-}
-
-void AddressBook::previous()
-{
-    QString name = nameLine->text();
-    QMap<QString, QString>::iterator i = contacts.find(name);
-
-    if (i == contacts.end()) {
-        nameLine->clear();
-        addressText->clear();
-        return;
-    }
-
-    if (i == contacts.begin())
-        i = contacts.end();
-
-    i--;
-    nameLine->setText(i.key());
-    addressText->setText(i.value());
-}
-
-void AddressBook::findContact()
-{
-    dialog->show();
-
-    if (dialog->exec() == 1) {
-        QString contactName = dialog->getFindText();
-
-        if (contacts.contains(contactName)) {
-            nameLine->setText(contactName);
-            addressText->setText(contacts.value(contactName));
-        } else {
-            QMessageBox::information(this, tr("Contact Not Found"),
-                tr("Sorry, \"%1\" is not in your address book.").arg(contactName));
-            return;
-        }
-    }
-
-    updateInterface(NavigationMode);
-}
-void AddressBook::updateInterface(Mode mode)
-{
-    currentMode = mode;
-
-    switch (currentMode) {
-
-    case AddingMode:
-    case EditingMode:
-
-        nameLine->setReadOnly(false);
-        nameLine->setFocus(Qt::OtherFocusReason);
-        addressText->setReadOnly(false);
-
-        addButton->setEnabled(false);
-        editButton->setEnabled(false);
-        removeButton->setEnabled(false);
-
-        nextButton->setEnabled(false);
-        previousButton->setEnabled(false);
-
-        submitButton->show();
-        cancelButton->show();
-
-        loadButton->setEnabled(false);
-        saveButton->setEnabled(false);
-        exportButton->setEnabled(false);
-        break;
-
-    case NavigationMode:
-        
-        if (contacts.isEmpty()) {
-            nameLine->clear();
-            addressText->clear();
-        }
-
-        nameLine->setReadOnly(true);
-        addressText->setReadOnly(true);
-        addButton->setEnabled(true);
-
-        int number = contacts.size();
-        editButton->setEnabled(number >= 1);
-        removeButton->setEnabled(number >= 1);
-        findButton->setEnabled(number > 2);
-        nextButton->setEnabled(number > 1);
-        previousButton->setEnabled(number > 1);
-
-        submitButton->hide();
-        cancelButton->hide();
-
-        exportButton->setEnabled(number >= 1);
-
-        loadButton->setEnabled(true);
-        saveButton->setEnabled(number >= 1);
-        break;
-    }
-}
-
-void AddressBook::saveToFile()
-{
-    QString fileName = QFileDialog::getSaveFileName(this,
-        tr("Save Address Book"), "",
-        tr("Address Book (*.abk);;All Files (*)"));
-        
-    if (fileName.isEmpty())
-        return;
-    else {
-        QFile file(fileName);
-
-        if (!file.open(QIODevice::WriteOnly)) {
-            QMessageBox::information(this, tr("Unable to open file"),
-                file.errorString());
-            return;
-        }
-
-        QDataStream out(&file);
-        out.setVersion(QDataStream::Qt_4_3);
-        out << contacts;
-    }
-
-    updateInterface(NavigationMode);
-}
-
-void AddressBook::loadFromFile()
-{
-    QString fileName = QFileDialog::getOpenFileName(this,
-        tr("Open Address Book"), "",
-        tr("Address Book (*.abk);;All Files (*)"));
-
-    if (fileName.isEmpty())
-        return;
-    else {
-        QFile file(fileName);
-
-        if (!file.open(QIODevice::ReadOnly)) {
-            QMessageBox::information(this, tr("Unable to open file"),
-                file.errorString());
-            return;
-        }
-
-        QDataStream in(&file);
-        in.setVersion(QDataStream::Qt_4_3);
-        contacts.empty();   // empty existing contacts
-        in >> contacts;
-
-        QMap<QString, QString>::iterator i = contacts.begin();
-        nameLine->setText(i.key());
-        addressText->setText(i.value());
-    }
-
-    updateInterface(NavigationMode);
-}
-
-//! [export function part1]
-void AddressBook::exportAsVCard()
-{
-    QString name = nameLine->text();
-    QString address = addressText->toPlainText();
-    QString firstName;
-    QString lastName;
-    QStringList nameList;
-
-    int index = name.indexOf(" ");
-
-    if (index != -1) {
-        nameList = name.split(QRegExp("\\s+"), QString::SkipEmptyParts);
-        firstName = nameList.first();
-        lastName = nameList.last();
-    } else {
-        firstName = name;
-        lastName = "";
-    }
-
-    QString fileName = QFileDialog::getSaveFileName(this,
-        tr("Export Contact"), "",
-        tr("vCard Files (*.vcf);;All Files (*)"));
-        
-    if (fileName.isEmpty())
-        return;
-
-    QFile file(fileName);
-//! [export function part1]
-    
-//! [export function part2]    
-    if (!file.open(QIODevice::WriteOnly)) {
-        QMessageBox::information(this, tr("Unable to open file"),
-            file.errorString());
-        return;
-    }
-
-    QTextStream out(&file);
-//! [export function part2]
-
-//! [export function part3]
-    out << "BEGIN:VCARD" << "\n";
-    out << "VERSION:2.1" << "\n";
-    out << "N:" << lastName << ";" << firstName << "\n";
-        
-    if (!nameList.isEmpty())            
-       out << "FN:" << nameList.join(" ") << "\n";
-    else
-       out << "FN:" << firstName << "\n";
-//! [export function part3] 
-
-//! [export function part4]
-    address.replace(";", "\\;", Qt::CaseInsensitive);
-    address.replace("\n", ";", Qt::CaseInsensitive);
-    address.replace(",", " ", Qt::CaseInsensitive);
-
-    out << "ADR;HOME:;" << address << "\n";
-    out << "END:VCARD" << "\n";
-
-    QMessageBox::information(this, tr("Export Successful"),
-        tr("\"%1\" has been exported as a vCard.").arg(name));
-}
-//! [export function part4]
diff --git a/examples/tutorials/addressbook-fr/part7/addressbook.h b/examples/tutorials/addressbook-fr/part7/addressbook.h
deleted file mode 100644
index eb18cdc955..0000000000
--- a/examples/tutorials/addressbook-fr/part7/addressbook.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef ADDRESSBOOK_H
-#define ADDRESSBOOK_H
-
-#include <QWidget>
-#include <QMap>
-#include "finddialog.h"
-
-QT_BEGIN_NAMESPACE
-class QPushButton;
-class QLabel;
-class QLineEdit;
-class QTextEdit;
-QT_END_NAMESPACE
-
-
-class AddressBook : public QWidget
-{
-    Q_OBJECT
-
-public:
-    AddressBook(QWidget *parent = 0);
-    enum Mode { NavigationMode, AddingMode, EditingMode };
-
-public slots:
-    void addContact();
-    void editContact();
-    void submitContact();
-    void cancel();
-    void removeContact();
-    void findContact();
-    void next();
-    void previous();
-    void saveToFile();
-    void loadFromFile();
-//! [exportAsVCard() declaration]
-    void exportAsVCard();
-//! [exportAsVCard() declaration]       
-
-private:
-    void updateInterface(Mode mode);
-
-    QPushButton *addButton;
-    QPushButton *editButton;
-    QPushButton *removeButton;
-    QPushButton *findButton;
-    QPushButton *submitButton;
-    QPushButton *cancelButton;
-    QPushButton *nextButton;
-    QPushButton *previousButton;
-    QPushButton *loadButton;
-    QPushButton *saveButton;
-//! [exportButton declaration] 
-    QPushButton *exportButton;
-//! [exportButton declaration]     
-    QLineEdit *nameLine;
-    QTextEdit *addressText;
-
-    QMap<QString, QString> contacts;
-    FindDialog *dialog;
-    QString oldName;
-    QString oldAddress;
-    Mode currentMode;
-};
-
-#endif
diff --git a/examples/tutorials/addressbook-fr/part7/finddialog.cpp b/examples/tutorials/addressbook-fr/part7/finddialog.cpp
deleted file mode 100644
index 686af08c71..0000000000
--- a/examples/tutorials/addressbook-fr/part7/finddialog.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "finddialog.h"
-
-FindDialog::FindDialog(QWidget *parent)
-    : QDialog(parent)
-{
-    QLabel *findLabel = new QLabel(tr("Enter the name of a contact:"));
-    lineEdit = new QLineEdit;
-
-    findButton = new QPushButton(tr("&Find"));
-    findText = "";
-
-    QHBoxLayout *layout = new QHBoxLayout;
-    layout->addWidget(findLabel);
-    layout->addWidget(lineEdit);
-    layout->addWidget(findButton);
-
-    setLayout(layout);
-    setWindowTitle(tr("Find a Contact"));
-    connect(findButton, SIGNAL(clicked()), this, SLOT(findClicked()));
-    connect(findButton, SIGNAL(clicked()), this, SLOT(accept()));
-}
-
-void FindDialog::findClicked()
-{
-    QString text = lineEdit->text();
-
-    if (text.isEmpty()) {
-        QMessageBox::information(this, tr("Empty Field"),
-            tr("Please enter a name."));
-        return;
-    } else {
-        findText = text;
-        lineEdit->clear();
-        hide();
-    }
-}
-
-QString FindDialog::getFindText()
-{
-    return findText;
-}
diff --git a/examples/tutorials/addressbook-fr/part7/finddialog.h b/examples/tutorials/addressbook-fr/part7/finddialog.h
deleted file mode 100644
index 86a33bbb72..0000000000
--- a/examples/tutorials/addressbook-fr/part7/finddialog.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef FINDDIALOG_H
-#define FINDDIALOG_H
-
-#include <QDialog>
-
-QT_BEGIN_NAMESPACE
-class QLineEdit;
-class QPushButton;
-QT_END_NAMESPACE
-
-class FindDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    FindDialog(QWidget *parent = 0);
-    QString getFindText();
-
-public slots:
-    void findClicked();
-
-private:
-    QPushButton *findButton;
-    QLineEdit *lineEdit;
-    QString findText;
-};
-
-#endif
diff --git a/examples/tutorials/addressbook-fr/part7/main.cpp b/examples/tutorials/addressbook-fr/part7/main.cpp
deleted file mode 100644
index 663fbb7d09..0000000000
--- a/examples/tutorials/addressbook-fr/part7/main.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include "addressbook.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    AddressBook addressBook;
-    addressBook.show();
-
-    return app.exec();
-}
diff --git a/examples/tutorials/addressbook-fr/part7/part7.desktop b/examples/tutorials/addressbook-fr/part7/part7.desktop
deleted file mode 100644
index f78ff4b221..0000000000
--- a/examples/tutorials/addressbook-fr/part7/part7.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=7 Address Book FR
-Exec=/opt/usr/bin/part7
-Icon=part7
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/tutorials/addressbook-fr/part7/part7.pro b/examples/tutorials/addressbook-fr/part7/part7.pro
deleted file mode 100644
index 0b8ba50969..0000000000
--- a/examples/tutorials/addressbook-fr/part7/part7.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-SOURCES   = addressbook.cpp \
-            finddialog.cpp \
-            main.cpp
-HEADERS   = addressbook.h \
-            finddialog.h
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part7
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part7.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part7
-INSTALLS += target sources
-QT += widgets
-
-
-simulator: warning(This example might not fully work on Simulator platform)