summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-20 22:39:52 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-20 22:40:09 +0100
commit9e819c2f46380b922625638b7ad4b6c8b9f9bb9a (patch)
tree1bc2d2d5dfe969706388a59e3b804416b58d0500
parentcfff119931e775c1d962c6b143e2a2711903bab5 (diff)
parentea25c59aa9e6d7ef69ba6e06a1509042b4af0d51 (diff)
downloadqtdoc-9e819c2f46380b922625638b7ad4b6c8b9f9bb9a.tar.gz
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts: .qmake.conf Change-Id: If0de46e2d3f1602dc3a2bf6483d172b730fa3be4
-rw-r--r--dist/changes-5.10.026
-rw-r--r--dist/changes-5.9.325
-rw-r--r--dist/changes-5.9.425
-rw-r--r--doc/src/getting-started/gettingstartedqt.qdoc516
-rw-r--r--doc/src/legal/android-runtime-licensing-notes.qdoc92
-rw-r--r--doc/src/modules.qdoc2
-rw-r--r--doc/src/platforms/supported-platforms.qdocinc13
-rw-r--r--doc/src/snippets/gs/notepad1.cpp79
-rw-r--r--doc/src/snippets/gs/notepad1.h86
-rw-r--r--doc/src/snippets/gs/notepad2.cpp56
-rw-r--r--doc/src/snippets/gs/notepad2.h72
11 files changed, 171 insertions, 821 deletions
diff --git a/dist/changes-5.10.0 b/dist/changes-5.10.0
new file mode 100644
index 00000000..958006cc
--- /dev/null
+++ b/dist/changes-5.10.0
@@ -0,0 +1,26 @@
+Qt 5.10 introduces many new features and improvements as well as bugfixes
+over the 5.9.x series. For more details, refer to the documentation included
+in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/
+
+The Qt version 5.10 series is binary compatible with the 5.9.x series.
+Applications compiled for 5.9 will continue to run with 5.10.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Qt 5.10.0 Changes *
+****************************************************************************
+
+ - Updated documentation for Qt for VxWorks.
+ - Clarified on where Qt license files are stored locally.
+ - Documented dynamic language changes in Qt Quick applications.
+ - Added examples/demos: Qt Cluster Demo, Coffee.
+ - Fixed several instances of missing, incorrect, or obsolete information.
diff --git a/dist/changes-5.9.3 b/dist/changes-5.9.3
new file mode 100644
index 00000000..378f72cb
--- /dev/null
+++ b/dist/changes-5.9.3
@@ -0,0 +1,25 @@
+Qt 5.9.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+For more details, refer to the documentation included in this distribution.
+The documentation is also available online:
+
+https://doc.qt.io/qt-5/
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Qt 5.9.3 Changes *
+****************************************************************************
+
+ - Updated documentation on Qt for VxWorks.
+ - Fixed several instances of missing, incorrect, or obsolete information.
diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4
new file mode 100644
index 00000000..d49a42f5
--- /dev/null
+++ b/dist/changes-5.9.4
@@ -0,0 +1,25 @@
+Qt 5.9.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Qt 5.9.4 Changes *
+****************************************************************************
+
+ - This release contains only minor code improvements.
+
diff --git a/doc/src/getting-started/gettingstartedqt.qdoc b/doc/src/getting-started/gettingstartedqt.qdoc
deleted file mode 100644
index 7c448c28..00000000
--- a/doc/src/getting-started/gettingstartedqt.qdoc
+++ /dev/null
@@ -1,516 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \page gettingstartedqt.html
-
- \title Getting Started Programming with Qt Widgets
-
- In this topic, we teach basic Qt knowledge by implementing a simple Notepad
- application using C++ and the \l{Qt Widgets} module. The application is a
- small text editor which allows you to create a text file, save it, print it,
- or reopen and edit it again. You can also set the font to be used.
-
- \image notepad1.png "Notepad application"
-
- You can find the final Notepad source files in the qtdoc repository in the
- snippets/widgets-tutorial/notepad directory. You can either fetch
- the Qt 5 sources from Qt Project or install them as part of Qt 5.
-
- \section1 Creating the Notepad Project
-
- Setting up a new project in Qt Creator is aided by a wizard that guides you
- step-by-step through the project creation process. The wizard prompts you
- to enter the settings needed for that particular type of project and creates
- the project for you.
-
- \image notepad2.png "Qt Creator New File or Project dialog"
-
- To create the Notepad project, select \b File > \b{New File or Project} >
- \b Applications > \b {Qt Widgets Application} > \b Choose, and follow the
- instructions of the wizard. In the \b {Class Information} dialog, type
- \b Notepad as the class name and select \b QMainWindow as the base class.
-
- \image notepad3.png "Class Information Dialog"
-
- The \b {Qt Widgets Application} wizard creates a project that contains a main
- source file and a set of files that specify a user interface (Notepad
- widget):
-
- \list
- \li notepad.pro - the project file.
- \li main.cpp - the main source file for the application.
- \li notepad.cpp - the source file of the notepad class of the Notepad
- widget.
- \li notepad.h - the header file of the notepad class for the Notepad
- widget.
- \li notepad.ui - the UI form for the Notepad widget.
- \endlist
-
- The .cpp, .h, and .ui files come with the necessary boiler plate code for
- you to be able to build and run the project. The .pro file is complete.
- We will take a closer look at the file contents in the following sections.
-
- \b{Learn More}
-
- \table
- \header
- \li About
- \li Here
- \row
- \li Using Qt Creator
- \li \l{Qt Creator Manual}{Qt Creator}
- \row
- \li Creating other kind of applications with Qt Creator
- \li \l{Qt Creator: Tutorials}{Qt Creator Tutorials}
- \endtable
-
-
- \section1 Main Source File
-
- The wizard generates the following code in the main.cpp file:
-
- \snippet snippets/widgets-tutorial/notepad/main.cpp all
-
- We will go through the code line by line. The following lines include
- the header files for the Notepad widget and QApplication. All Qt classes
- have a header file named after them.
-
- \snippet snippets/widgets-tutorial/notepad/main.cpp 1
-
- The following line defines the main function that is the entry point for
- all C and C++ based applications:
-
- \snippet snippets/widgets-tutorial/notepad/main.cpp 2
-
- The following line creates a QApplication object. This object manages
- application-wide resources and is necessary to run any Qt program
- that uses Qt Widgets. It constructs an application object with \c argc
- command line arguments run in \c argv. (For GUI applications that do not
- use Qt Widgets, you can use QGuiApplication instead.)
-
- \snippet snippets/widgets-tutorial/notepad/main.cpp 3
-
- The following line creates the Notepad object. This is the object for
- which the wizard
- created the class and the UI file. The user interface contains visual
- elements that are called \c widgets in Qt. Examples of widgets are text
- edits, scroll bars, labels, and radio buttons. A widget can also be a
- container for other widgets; a dialog or a main application window, for
- example.
-
- \snippet snippets/widgets-tutorial/notepad/main.cpp 4
-
- The following line shows the Notepad widget on the screen in its own
- window. Widgets can also function as containers. An example of this
- is QMainWindow which often contains several types of widgets. Widgets
- are not visible by default; the function \l{QWidget::}{show()} makes
- the widget visible.
-
- \snippet snippets/widgets-tutorial/notepad/main.cpp 5
-
- The following line makes the QApplication enter its event loop. When a Qt
- application is running, events are generated and sent to the
- widgets of the application. Examples of events are mouse presses
- and key strokes.
-
- \snippet snippets/widgets-tutorial/notepad/main.cpp 6
-
- \b{Learn More}
-
- \table
- \header
- \li About
- \li Here
- \row
- \li Widgets and Window Geometry
- \li \l{Window and Dialog Widgets}
- \row
- \li Events and event handling
- \li \l{The Event System}
- \endtable
-
- \section1 Designing a UI
-
- The wizard generates a user interface definition in XML format: notepad.ui.
- When you open the notepad.ui file in Qt Creator, it automatically opens
- in the integrated Qt Designer.
-
- When you build the application, Qt Creator launches the Qt
- \l{User Interface Compiler (uic)} that reads the .ui file and creates a
- corresponding C++ header file, ui_notepad.h.
-
- \section2 Using Qt Designer
-
- The wizard creates an application that uses a QMainWindow. It has its own
- layout to which you can add a menu bar, dock widgets, toolbars, and a
- status bar. The center area can be occupied by any kind of widget. The
- wizard places the Notepad widget there.
-
- To add widgets in Qt Designer:
-
- \list 1
- \li In the Qt Creator \b Editor mode, double-click the notepad.ui file
- in the \b Projects view to launch the file in the integrated Qt
- Designer.
- \li Drag and drop widgets Text Edit (QTextEdit) to the form.
- \li Press \b {Ctrl+A} (or \b {Cmd+A}) to select the widgets and click
- \b {Lay out Vertically} (or press \b {Ctrl+L}) to apply a vertical
- layout (QVBoxLayout).
- \li Press \b {Ctrl+S} (or \b {Cmd+S}) to save your changes.
- \endlist
-
- The UI now looks as follows in Qt Designer:
-
- \image notepad4.png
-
- You can view the generated XML file in the code editor:
-
- \quotefromfile snippets/widgets-tutorial/notepad/notepad.ui
-
- \printuntil QMenuBar
- \dots
-
- The following line contains the XML declaration, which specifies the XML
- version and character encoding used in the document:
-
- \code
- <?xml version="1.0" encoding="UTF-8"?>
- \endcode
-
- The rest of the file specifies an \c ui element that defines a Notepad
- widget:
-
- \code
- <ui version="4.0">
- \endcode
-
- The UI file is used together with the header and source file of the Notepad
- class. We will look at the rest of the UI file in the later sections.
-
- \section2 Notepad Header File
-
- The wizard generated a header file for the Notepad class that has the
- necessary #includes, a constructor, a destructor, and the Ui object. The
- file looks as follows:
-
- \snippet snippets/gs/notepad1.h all
-
- The following line includes QMainWindow that provides a main application
- window:
-
- \snippet snippets/gs/notepad1.h 1
-
- The following lines declare the Notepad class in the Ui namespace, which is the
- standard namespace for the UI classes generated from .ui files by the
- \c uic tool:
-
- \snippet snippets/gs/notepad1.h 2
-
- The class declaration contains the \c Q_OBJECT macro. It must come first in the class
- definition, and declares our class as a QObject. Naturally, it must also
- inherit from QObject. A QObject adds several abilities to a normal C++
- class. Notably, the class name and slot names can be
- queried at runtime. It is also possible to query a slot's
- parameter types and invoke it.
-
- \snippet snippets/gs/notepad1.h 3
-
- The following lines declare a constructor that has a default argument
- called \c parent.
- The value 0 indicates that the widget has no parent (it is a top-level
- widget).
-
- \snippet snippets/gs/notepad1.h 4
-
- The following line declares a virtual destructor to free the resources that were
- acquired by the object during its life-cycle. According to the C++
- naming convention, destructors have the same name as the class they are
- associated with, prefixed with a tilde (~). In QObject, destructors are
- virtual to ensure that the destructors of derived classes are invoked
- properly when an object is deleted through a pointer-to-base-class.
-
- \snippet snippets/gs/notepad1.h 5
-
- The following lines declare a member variable which is a pointer to the Notepad UI
- class. A member variable is associated with a specific class, and accessible
- for all its methods.
-
- \snippet snippets/gs/notepad1.h 6
-
- \section2 Notepad Source File
-
- The source file that the wizard generated for the Notepad class looks as
- follows:
-
- \snippet snippets/gs/notepad1.cpp all
-
- The following lines include the Notepad class header file that was generated
- by the wizard and the UI header file that was generated by the \c uic tool:
-
- \snippet snippets/gs/notepad1.cpp 0
-
- The following line defines the \c {Notepad} constructor:
-
- \snippet snippets/gs/notepad1.cpp 1
-
- The following line calls the QMainWindow constructor, which is the base
- class for the Notepad class:
-
- \snippet snippets/gs/notepad1.cpp 2
-
- The following line creates the UI class instance and assigns it to the
- \c ui member:
-
- \snippet snippets/gs/notepad1.cpp 3
-
- The following line sets up the UI:
-
- \snippet snippets/gs/notepad1.cpp 4
-
- In the destructor, we delete the \c ui:
-
- \snippet snippets/gs/notepad1.cpp 5
-
- In order to have the text edit field occupy the whole screen, we add
- \c setCentralWidget to the main window.
-
- \snippet snippets/widgets-tutorial/notepad/notepad.cpp 1
-
- \section2 Project File
-
- The wizard generates the following project file, \c {notepad.pro}, for us:
-
- \quotefile snippets/widgets-tutorial/notepad/notepad.pro
-
- The project file specifies the application name and the \c qmake template to
- use for generating the project, as well as the source, header, and UI files
- included in the project.
-
- You could also use \c qmake's \c -project option to generate the \.pro file. Although,
- in that case, you have to remember to add the line \c{QT += widgets} to the generated
- file in order to link against the Qt Widgets Module.
-
- \b{Learn More}
-
- \table
- \header
- \li About
- \li Here
- \row
- \li Using Qt Designer
- \li \l{Qt Designer Manual}
- \row
- \li Layouts
- \li \l{Layout Management},
- \l{Widgets and Layouts},
- \l{Layout Examples}
- \row
- \li The widgets that come with Qt
- \li \l{Qt Widget Gallery}
- \row
- \li Main windows and main window classes
- \li \l{Application Main Window},
- \l{Main Window Examples}
- \row
- \li QObjects and the Qt Object model (This is essential to
- understand Qt)
- \li \l{Object Model}
- \row
- \li qmake and the Qt build system
- \li \l{qmake Manual}
- \endtable
-
- \section1 Adding User Interaction
-
-
- To add functionality to the editor, we start by adding menu items and buttons on a toolbar.
-
- Click on "Type Here", and add the options New, Open, Save, Save as, Print
- and Exit. This creates 5 lines in the Action Editor below. To connect the
- actions to slots, right-click an action and select Go to slot > triggered(),
- and complete the code for that given slot.
-
- If we also want to add the actions to a toolbar, we can assign an icon
- to each QAction, and then drag the QAction to the toolbar. You assign an icon
- by entering an icon name in the Icon property of the action concerned. When the QAction
- has been dragged to the toolbar, clicking the icon will launch the associated
- slot.
-
- Complete the method \c on_actionNew_triggered() :
-
- \snippet snippets/widgets-tutorial/notepad/notepad.cpp 2
-
- \c current_file is a global variable containing the file presently being edited.
- It is defined in the private part of notepad.h:
-
- \snippet snippets/widgets-tutorial/notepad/notepad.h 6
-
- \c setText("") clears the text buffer.
-
- \section2 Opening a file
-
- In \c notepad.ui, right click on \c actionOpen and select \c {Go to slot}
-
- Complete method \c on_actionOpen_triggered().
-
- \snippet snippets/widgets-tutorial/notepad/notepad.cpp 3
-
- \c QFileDialog::getOpenFileName opens a dialog enabling you to select a file.
- QFile object \c myfile has the selected \c file_name as parameter.
- We store the selected file also into the global variable \c current_file for later purposes.
- We open the file with \c file.open as a readonly text file. If it
- cannot be opened, a warning is issued, and the program stops.
-
- We define a QTextStream \c instream for parameter \c myfile.
- The contents of file \c myfile is copied into QString \a text.
- \c setText(text) fille the buffer of our editor with \c text.
-
- \c section2 Saving a file
-
- We create the method for saving a file in the same way as for \l {Opening a file},
- by right clicking on \c actionSave, and selecting \c {Go to Slot}.
-
- \snippet snippets/widgets-tutorial/notepad/notepad.cpp 4
-
- QFile object \c myfile is linked to global variable \c current_file, the variable that
- contains the file we were working with.
- If we cannot open \c myfile, an error message is issued and the method stops.
- We create a QTextStream \c outstream. The contents of the editor buffer is converted
- to plain text, and then written to \c outstream.
-
- \c section2 Saving a file with \c {Save as}
-
- \snippet snippets/widgets-tutorial/notepad/notepad.cpp 5
-
- This is the same procedure as for \c {Saving a file}, the only difference
- being that here you need to enter a new file name for the file to
- be created.
-
-
- \section2 Print a file
-
- If you want to use print functionalities, you need to add \c printsupport to
- the project file:
-
- QT += core gui printsupport
-
- We declare a QPrinter object called \c printer.
- We launch a printer dialog box and store the selected printer in object \c printer.
- If we clicked on \c Cancel and did not select a printer, the methods returns.
- The actual printer command is given with \a ui->textEdit->print with our QPrinter
- object as parameter.
-
- \section2 Select a font
-
- \snippet snippets/widgets-tutorial/notepad/notepad.cpp 7
-
- We declare a boolean indicating if we did select a font with QFontDialog. If so, we
- set the font with \c ui->textEdit->setFont(myfont).
-
- \section2 Copy, cut, paste, undo, redo
-
- If you select some text, and want to copy it to the clipboard,
- you call the appropriate method of ui->textEdit. The same counts
- for cut, paste, undo, and redo.
-
- This table shows the method name to use.
-
- \table
- \header
- \li Task
- \li Method called
- \row
- \li Copy
- \li ui->textEdit->copy()
- \row
- \li Cut
- \li ui->textEdit->cut()
- \row
- \li Paste
- \li ui->textEdit->paste()
- \row
- \li Undo
- \li ui->textEdit->undo()
- \row
- \li Redo
- \li ui->textEdit->redo()
- \endtable
-
- This project contains the following files:
-
- \list
- \li {main.cpp}
- \li {notepad.cpp}
- \li {notepad.h}
- \li {notepad.pro}
- \li {notepad.ui}
- \endlist
- \b{Learn More}
-
- \table
- \header
- \li About
- \li Here
- \row
- \li MDI applications
- \li QMdiArea,
- \l{MDI Example}
- \row
- \li Files and I/O devices
- \li QFile, QIODevice
- \row
- \li tr() and internationalization
- \li \l{Qt Linguist Manual},
- \l{Writing Source Code for Translation},
- \l{Internationalization with Qt}
- \endtable
-
- \section1 Building and Running Notepad
-
- Now that you have all the necessary files, select \b Build >
- \b {Build Project Notepad} to build and run the application. Qt Creator
- uses \c qmake and \c make to create an executable in the directory
- specified in the build settings of the project and runs it.
-
- \section2 Building and Running from the Command Line
-
- To build the application from the command line, switch to the
- directory in which you have the \c .cpp file of the application and add the
- project file (suffixed .pro) described earlier. The following shell commands
- then build the application:
-
- \code
- qmake
- make (or nmake on Windows)
- \endcode
-
- The commands create an executable in the project directory. The \c qmake tool reads the
- project file and produces a \c Makefile with instructions on how to build the application.
- The \c make tool (or the \c nmake tool) then reads the \c Makefile and produces the executable
- binary.
-*/
diff --git a/doc/src/legal/android-runtime-licensing-notes.qdoc b/doc/src/legal/android-runtime-licensing-notes.qdoc
index dd9a92bc..772bed44 100644
--- a/doc/src/legal/android-runtime-licensing-notes.qdoc
+++ b/doc/src/legal/android-runtime-licensing-notes.qdoc
@@ -35,17 +35,19 @@ The Android platform does not provide a full implementation of the C++ run-time.
apps that depend on features such as STL, exceptions, or RTTI, must include an additional
native run-time library that provides the features they need.
-Qt will by default use the GNU libstdc++ library which is distributed as part of the Google Android NDK.
-Qt Creator will copy this library into the .APK for any Qt-based Android app. The library will then be
-loaded by the app on start-up to meet the run-time requirements of Qt.
-
-The GNU C++ run-time is licensed under the
+When built with g++, Qt will use the GNU libstdc++ library which is distributed as part of the Google
+Android NDK. Qt Creator will copy this library into the .APK for any Qt-based Android app. The library
+will then be loaded by the app on start-up to meet the run-time requirements of Qt.The GNU C++ run-time
+is licensed under the
\l{http://gcc.gnu.org/onlinedocs/libstdc++/manual/appendix_gpl.html}{GNU General Public License version 3} with
an exception which grants permission for run-time linking and usage of the library by an application which
would otherwise violate the terms of the main license. For more information about this exception, see
\l{http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html}{the official license page}.
-\section1 Information About License From GCC Headers
+When Qt is built with clang instead, it will use LLVM's libc++, which is dual-licensed under both the
+University of Illinois "BSD-Like" license and the MIT license.
+
+\section1 Information About The GNU C++ Run-time License From GCC Headers
This file is part of the GNU ISO C++ Library. This library is free
software; you can redistribute it and/or modify it under the terms
@@ -142,6 +144,84 @@ The availability of this Exception does not imply any general
presumption that third-party software is unaffected by the copyleft
requirements of the license of GCC.
+\section1 Information About The LLVM C++ Run-time License
+
+==============================================================================
+libc++ License
+==============================================================================
+
+The libc++ library is dual licensed under both the University of Illinois
+"BSD-Like" license and the MIT license. As a user of this code you may choose
+to use it under either license. As a contributor, you agree to allow your code
+to be used under both.
+
+Full text of the relevant licenses is included below.
+
+==============================================================================
+
+University of Illinois/NCSA
+Open Source License
+
+Copyright (c) 2009-2017 by the contributors listed in CREDITS.TXT
+
+All rights reserved.
+
+Developed by:
+
+ LLVM Team
+
+ University of Illinois at Urbana-Champaign
+
+ http://llvm.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimers.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimers in the
+ documentation and/or other materials provided with the distribution.
+
+ * Neither the names of the LLVM Team, University of Illinois at
+ Urbana-Champaign, nor the names of its contributors may be used to
+ endorse or promote products derived from this Software without specific
+ prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
+
+==============================================================================
+
+Copyright (c) 2009-2014 by the contributors listed in CREDITS.TXT
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
*/
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 485385b7..cd2f643b 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -55,6 +55,8 @@
\section1 License Information
\badcode
+ Copyright (C) 2016 The Qt Company Ltd.
+
Commercial License Usage
Licensees holding valid commercial Qt licenses may use this file in
accordance with the commercial license agreement provided with the
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index ee880b3f..f9f7a496 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -153,6 +153,11 @@ Mobile Platforms: \l {Qt for Android}{Android},
\li MSVC 2017, MSVC 2015, MSVC 2013, MinGW 5.3
\li \l{https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/5.3.0/threads-posix/dwarf/i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z/download}{MinGW-builds gcc 5.3.0 (32-bit)}
+ \row \li {3,1} \header \li {3,1} Universal Windows Platform (UWP)
+ \row \li UWP 10 (x86, \b x86_64, armv7)
+ \li MSVC 2017, \b {MSVC 2015}
+ \li Hosts: \b {Windows 10}
+
\row \li {3,1} \header \li {3,1} \l {Qt for Linux/X11}{Linux/X11}
\row \li openSUSE 42.1 (64-bit)
\li \b {GCC 4.8.5}
@@ -180,7 +185,7 @@ Mobile Platforms: \l {Qt for Android}{Android},
\l{Qt for VxWorks}{VxWorks}
\row \li \l {Qt for Embedded Linux}{Embedded Linux}
\li GCC \li ARM Cortex-A, Intel boards with GCC-based toolchains
- \row \li QNX 6.6.0, 7.0 (armv7le and x86)
+ \row \li QNX 6.6 (armv7le and x86), 7.0 (armv7le, arm64 and x86)
\li \b {GCC as provided by QNX}
\li Hosts: \b {RHEL 6.6 (64-bit)}, \b {RHEL 7.2 (64-bit)},
\b {Windows 10 (64-bit)}, \b {Windows 7 (32-bit)}
@@ -192,11 +197,7 @@ Mobile Platforms: \l {Qt for Android}{Android},
\li Hosts: 64-bit Linux, Windows
\row \li {3,1} \header \li {3,1}
- Mobile Platforms: \l {Qt for Android}{Android}, \l {Qt for iOS}{iOS},
- Universal Windows Platform (UWP)
- \row \li Universal Windows Platform (UWP) (x86, \b x86_64, armv7)
- \li MSVC 2017, \b {MSVC 2015}
- \li Hosts: \b {Windows 10}
+ Mobile Platforms: \l {Qt for Android}{Android}, \l {Qt for iOS}{iOS}
\row \li iOS 8, 9, 10 (armv7, arm64)
\li \b {Clang as provided by Apple}
\li \b {\macos 10.10 host}
diff --git a/doc/src/snippets/gs/notepad1.cpp b/doc/src/snippets/gs/notepad1.cpp
deleted file mode 100644
index 11362d26..00000000
--- a/doc/src/snippets/gs/notepad1.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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 The Qt Company Ltd 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$
-**
-****************************************************************************/
-
-//! [all]
-//! [0]
-#include "notepad.h"
-#include "ui_notepad.h"
-//! [0]
-
-//! [1]
-Notepad::Notepad(QWidget *parent) :
-//! [1]
-//! [2]
- QMainWindow(parent),
-//! [2]
-//! [3]
- ui(new Ui::Notepad)
-//! [3]
-{
-
-//! [4]
- ui->setupUi(this);
-//! [4]
-}
-
-//! [5]
-Notepad::~Notepad()
-{
- delete ui;
-}
-//! [5]
-//! [all]
diff --git a/doc/src/snippets/gs/notepad1.h b/doc/src/snippets/gs/notepad1.h
deleted file mode 100644
index 1f25c1a7..00000000
--- a/doc/src/snippets/gs/notepad1.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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 The Qt Company Ltd 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 NOTEPAD_H
-#define NOTEPAD_H
-
-//! [all]
-//! [1]
-#include <QMainWindow>
-//! [1]
-
-//! [2]
-namespace Ui {
-class Notepad;
-}
-//! [2]
-
-//! [3]
-class Notepad : public QMainWindow
-{
- Q_OBJECT
-//! [3]
-
-//! [4]
-public:
- explicit Notepad(QWidget *parent = 0);
-//! [4]
-//! [5]
- ~Notepad();
-//! [5]
-
-//! [6]
-private:
- Ui::Notepad *ui;
-//! [6]
-};
-//! [all]
-
-#endif // NOTEPAD_H
diff --git a/doc/src/snippets/gs/notepad2.cpp b/doc/src/snippets/gs/notepad2.cpp
deleted file mode 100644
index 349bd0ac..00000000
--- a/doc/src/snippets/gs/notepad2.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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 The Qt Company Ltd 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$
-**
-****************************************************************************/
-
-//! [all]
-void Notepad::on_quitButton_clicked()
-{
-
-}
-//! [all]
diff --git a/doc/src/snippets/gs/notepad2.h b/doc/src/snippets/gs/notepad2.h
deleted file mode 100644
index 237f8a32..00000000
--- a/doc/src/snippets/gs/notepad2.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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 The Qt Company Ltd 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$
-**
-****************************************************************************/
-
-//! [all]
-namespace Ui {
-class Notepad;
-}
-
-class Notepad : public QMainWindow
-{
- Q_OBJECT
-
-public:
- explicit Notepad(QWidget *parent = 0);
- ~Notepad();
-
-//! [1]
-private slots:
- void on_quitButton_clicked();
-//! [1]
-
-private:
- Ui::Notepad *ui;
-};
-//! [all]