Merge branch 'release' into stable

Change-Id: If3aa1b7ed75082eff6e9761ad82c83691135ed60

26 files changed, 32 insertions, 69 deletions

diff --git a/examples/widgets/doc/src/codeeditor.qdoc b/examples/widgets/doc/src/codeeditor.qdoc
index 91abe1339c..2848908233 100644
--- a/examples/widgets/doc/src/codeeditor.qdoc
+++ b/examples/widgets/doc/src/codeeditor.qdoc
@@ -192,6 +192,6 @@
     fetched with QTextBlock::userData(). Matching parentheses can be
     highlighted with an extra selection. The "Matching Parentheses
     with QSyntaxHighlighter" article in Qt Quarterly 31 implements
-    this. You find it here: \l{http://doc.qt.nokia.com/qq/}.
+    this. You find it here: \l{http://doc.qt.digia.com/qq/}.
 
 */
diff --git a/examples/widgets/doc/src/syntaxhighlighter.qdoc b/examples/widgets/doc/src/syntaxhighlighter.qdoc
index 75b883a6f5..3ebfcad380 100644
--- a/examples/widgets/doc/src/syntaxhighlighter.qdoc
+++ b/examples/widgets/doc/src/syntaxhighlighter.qdoc
@@ -248,7 +248,7 @@
     It is possible to implement parenthesis matching with
     QSyntaxHighlighter. The "Matching Parentheses with
     QSyntaxHighlighter" article in Qt Quarterly 31
-    (\l{http://doc.qt.nokia.com/qq/}) implements this. We also have
+    (\l{http://doc.qt.digia.com/qq/}) implements this. We also have
     the \l{Code Editor Example}, which shows how to implement line
     numbers and how to highlight the current line.
 
diff --git a/examples/widgets/painting/painting.pro b/examples/widgets/painting/painting.pro
index 7459dd3e94..a9749a560d 100644
--- a/examples/widgets/painting/painting.pro
+++ b/examples/widgets/painting/painting.pro
@@ -1,28 +1,15 @@
 TEMPLATE      = subdirs
 SUBDIRS       = basicdrawing \
                 concentriccircles \
-                examples_affine \
-                examples_composition \
-                examples_deform \
-                examples_gradients \
-                examples_pathstroke \
-                painting_shared \
+                affine \
+                composition \
+                deform \
+                gradients \
+                pathstroke \
                 imagecomposition \
                 painterpaths \
                 transformations \
                 fontsampler
 
-examples_affine.subdir = affine
-examples_composition.subdir = composition
-examples_deform.subdir = deform
-examples_gradients.subdir = gradients
-examples_pathstroke.subdir = pathstroke
-painting_shared.subdir = shared
-
-!ordered {
-    examples_affine.depends = painting_shared
-    examples_deform.depends = painting_shared
-    examples_gradients.depends = painting_shared
-    examples_composition.depends = painting_shared
-    examples_pathstroke.depends = painting_shared
-}
+EXAMPLE_FILES = \
+    shared
diff --git a/examples/widgets/painting/shared/shared.pro b/examples/widgets/painting/shared/shared.pro
deleted file mode 100644
index 2756bf75ca..0000000000
--- a/examples/widgets/painting/shared/shared.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-TEMPLATE = lib
-CONFIG += static
-
-qtHaveModule(opengl) {
-	DEFINES += QT_OPENGL_SUPPORT
-	QT += opengl
-}
-QT += widgets
-
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
-TARGET = demo_shared
-
-SOURCES += \
-	arthurstyle.cpp\
-	arthurwidgets.cpp \
-	hoverpoints.cpp
-
-HEADERS += \
-	arthurstyle.h \
-	arthurwidgets.h \
-	hoverpoints.h
-
-RESOURCES += shared.qrc
diff --git a/examples/widgets/tools/codecs/codecs.pro b/examples/widgets/tools/codecs/codecs.pro
index 7b2baa3ec8..985952ed64 100644
--- a/examples/widgets/tools/codecs/codecs.pro
+++ b/examples/widgets/tools/codecs/codecs.pro
@@ -9,7 +9,7 @@ SOURCES      += main.cpp \
 EXAMPLE_FILES = encodedfiles
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/codecs
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/codecs
 INSTALLS += target
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/tools/completer/completer.pro b/examples/widgets/tools/completer/completer.pro
index b47b7a9057..96b4efe497 100644
--- a/examples/widgets/tools/completer/completer.pro
+++ b/examples/widgets/tools/completer/completer.pro
@@ -8,7 +8,7 @@ SOURCES   = fsmodel.cpp \
 RESOURCES = completer.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/completer
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/completer
 INSTALLS += target
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/tools/customcompleter/customcompleter.pro b/examples/widgets/tools/customcompleter/customcompleter.pro
index b8ccc83744..4905c0b7d8 100644
--- a/examples/widgets/tools/customcompleter/customcompleter.pro
+++ b/examples/widgets/tools/customcompleter/customcompleter.pro
@@ -8,7 +8,7 @@ SOURCES   = main.cpp \
 RESOURCES = customcompleter.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/customcompleter
 INSTALLS += target
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/tools/echoplugin/echoplugin.pro b/examples/widgets/tools/echoplugin/echoplugin.pro
index 986ba9c9c3..d95eb6b64a 100644
--- a/examples/widgets/tools/echoplugin/echoplugin.pro
+++ b/examples/widgets/tools/echoplugin/echoplugin.pro
@@ -5,5 +5,5 @@ SUBDIRS	    = echowindow \
 #! [0]
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/echoplugin
 INSTALLS += target
diff --git a/examples/widgets/tools/echoplugin/echowindow/echowindow.pro b/examples/widgets/tools/echoplugin/echowindow/echowindow.pro
index c8dc000678..2d14e5ba03 100644
--- a/examples/widgets/tools/echoplugin/echowindow/echowindow.pro
+++ b/examples/widgets/tools/echoplugin/echowindow/echowindow.pro
@@ -15,7 +15,7 @@ win32 {
 }
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/echoplugin
 INSTALLS += target
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/tools/echoplugin/plugin/plugin.pro b/examples/widgets/tools/echoplugin/plugin/plugin.pro
index 235358d52c..4afe56c024 100644
--- a/examples/widgets/tools/echoplugin/plugin/plugin.pro
+++ b/examples/widgets/tools/echoplugin/plugin/plugin.pro
@@ -12,5 +12,5 @@ DESTDIR         = ../plugins
 EXAMPLE_FILES = echoplugin.json
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin/plugin
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/echoplugin/plugin
 INSTALLS += target
diff --git a/examples/widgets/tools/i18n/i18n.pro b/examples/widgets/tools/i18n/i18n.pro
index 8095e44b3c..38d2bd978f 100644
--- a/examples/widgets/tools/i18n/i18n.pro
+++ b/examples/widgets/tools/i18n/i18n.pro
@@ -22,7 +22,7 @@ TRANSLATIONS += translations/i18n_ar.ts \
                 translations/i18n_zh.ts
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/i18n
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/i18n
 INSTALLS += target
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/tools/plugandpaint/plugandpaint.pro b/examples/widgets/tools/plugandpaint/plugandpaint.pro
index 0b20f81a1f..965eacf388 100644
--- a/examples/widgets/tools/plugandpaint/plugandpaint.pro
+++ b/examples/widgets/tools/plugandpaint/plugandpaint.pro
@@ -19,5 +19,5 @@ if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
 #! [0]
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaint
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/plugandpaint
 INSTALLS += target
diff --git a/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro b/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro
index aac2edce00..670ebb5709 100644
--- a/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro
+++ b/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro
@@ -10,5 +10,5 @@ DESTDIR       = ../../plugandpaint/plugins
 #! [0]
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaint/plugins
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/plugandpaint/plugins
 INSTALLS += target
diff --git a/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro b/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro
index 3280f119cf..aa0ead87bc 100644
--- a/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro
+++ b/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro
@@ -10,5 +10,5 @@ DESTDIR       = ../../plugandpaint/plugins
 
 #! [0]
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaint/plugins
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/plugandpaint/plugins
 INSTALLS += target
diff --git a/examples/widgets/tools/regexp/regexp.pro b/examples/widgets/tools/regexp/regexp.pro
index 0d2a9a280c..5fb17b50bc 100644
--- a/examples/widgets/tools/regexp/regexp.pro
+++ b/examples/widgets/tools/regexp/regexp.pro
@@ -5,7 +5,7 @@ SOURCES       = regexpdialog.cpp \
                 main.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/regexp
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/regexp
 INSTALLS += target
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/tools/settingseditor/settingseditor.pro b/examples/widgets/tools/settingseditor/settingseditor.pro
index 69b8a04c92..c144a3ee36 100644
--- a/examples/widgets/tools/settingseditor/settingseditor.pro
+++ b/examples/widgets/tools/settingseditor/settingseditor.pro
@@ -13,7 +13,7 @@ SOURCES       = locationdialog.cpp \
 EXAMPLE_FILES = inifiles
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/settingseditor
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/settingseditor
 INSTALLS += target
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/tools/styleplugin/plugin/plugin.pro b/examples/widgets/tools/styleplugin/plugin/plugin.pro
index 605e196bd9..c7e8de6ee2 100644
--- a/examples/widgets/tools/styleplugin/plugin/plugin.pro
+++ b/examples/widgets/tools/styleplugin/plugin/plugin.pro
@@ -18,5 +18,5 @@ win32 {
 EXAMPLE_FILES += simplestyle.json
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin/styles
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/styleplugin/styles
 INSTALLS += target
diff --git a/examples/widgets/tools/styleplugin/styleplugin.pro b/examples/widgets/tools/styleplugin/styleplugin.pro
index d7129e724b..b9f251116d 100644
--- a/examples/widgets/tools/styleplugin/styleplugin.pro
+++ b/examples/widgets/tools/styleplugin/styleplugin.pro
@@ -3,5 +3,5 @@ SUBDIRS		= stylewindow \
 		  plugin
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/styleplugin
 INSTALLS += target
diff --git a/examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro b/examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro
index 12adce4872..56aa373b0e 100644
--- a/examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro
+++ b/examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro
@@ -13,5 +13,5 @@ win32 {
 }
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/styleplugin
 INSTALLS += target
diff --git a/examples/widgets/tools/treemodelcompleter/treemodelcompleter.pro b/examples/widgets/tools/treemodelcompleter/treemodelcompleter.pro
index 56e0cee210..6a8f5ef3a1 100644
--- a/examples/widgets/tools/treemodelcompleter/treemodelcompleter.pro
+++ b/examples/widgets/tools/treemodelcompleter/treemodelcompleter.pro
@@ -8,7 +8,7 @@ SOURCES   = treemodelcompleter.cpp \
 RESOURCES = treemodelcompleter.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/treemodelcompleter
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/treemodelcompleter
 INSTALLS += target
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/tools/undo/undo.pro b/examples/widgets/tools/undo/undo.pro
index 5e0f1d7817..3727c8cbde 100644
--- a/examples/widgets/tools/undo/undo.pro
+++ b/examples/widgets/tools/undo/undo.pro
@@ -12,5 +12,5 @@ build_all:!build_pass {
 RESOURCES += undo.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/undo
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/undo
 INSTALLS += target
diff --git a/examples/widgets/tools/undoframework/undoframework.pro b/examples/widgets/tools/undoframework/undoframework.pro
index 9cea99f105..d6bf6b8b97 100644
--- a/examples/widgets/tools/undoframework/undoframework.pro
+++ b/examples/widgets/tools/undoframework/undoframework.pro
@@ -12,7 +12,7 @@ SOURCES	    = commands.cpp \
 RESOURCES   = undoframework.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/tools/undoframework
+target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/undoframework
 INSTALLS += target
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/tutorials/addressbook-fr/README b/examples/widgets/tutorials/addressbook-fr/README
index d24cedf51e..07897b9683 100644
--- a/examples/widgets/tutorials/addressbook-fr/README
+++ b/examples/widgets/tutorials/addressbook-fr/README
@@ -4,7 +4,7 @@ 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
+http://qt-project.org/doc/qt-5.0/qtwidgets/tutorials-addressbook.html
 
 All programs corresponding to the chapters in the tutorial should
 automatically be built when Qt is compiled, or will be provided as
diff --git a/examples/widgets/tutorials/addressbook/README b/examples/widgets/tutorials/addressbook/README
index 39753b4b25..07897b9683 100644
--- a/examples/widgets/tutorials/addressbook/README
+++ b/examples/widgets/tutorials/addressbook/README
@@ -4,7 +4,7 @@ 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/tutorial.html
+http://qt-project.org/doc/qt-5.0/qtwidgets/tutorials-addressbook.html
 
 All programs corresponding to the chapters in the tutorial should
 automatically be built when Qt is compiled, or will be provided as
diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro
index 87054cff0d..768b602e61 100644
--- a/examples/widgets/widgets.pro
+++ b/examples/widgets/widgets.pro
@@ -1,3 +1,5 @@
+requires(qtHaveModule(widgets))
+
 TEMPLATE      = subdirs
 CONFIG += no_docs_target
 
diff --git a/examples/widgets/widgets/stylesheet/mainwindow.cpp b/examples/widgets/widgets/stylesheet/mainwindow.cpp
index 40ff1f8dd2..9662833519 100644
--- a/examples/widgets/widgets/stylesheet/mainwindow.cpp
+++ b/examples/widgets/widgets/stylesheet/mainwindow.cpp
@@ -67,7 +67,7 @@ void MainWindow::on_aboutAction_triggered()
 {
     QMessageBox::about(this, tr("About Style sheet"),
         tr("The <b>Style Sheet</b> example shows how widgets can be styled "
-           "using <a href=\"http://qt.nokia.com/doc/4.5/stylesheet.html\">Qt "
+           "using <a href=\"http://doc.qt.digia.com/4.5/stylesheet.html\">Qt "
            "Style Sheets</a>. Click <b>File|Edit Style Sheet</b> to pop up the "
            "style editor, and either choose an existing style sheet or design "
            "your own."));