diff options
Diffstat (limited to 'examples')
53 files changed, 105 insertions, 128 deletions
diff --git a/examples/dbus/chat/chatmainwindow.ui b/examples/dbus/chat/chatmainwindow.ui index 0616dcb137..537bad5820 100644 --- a/examples/dbus/chat/chatmainwindow.ui +++ b/examples/dbus/chat/chatmainwindow.ui @@ -13,7 +13,7 @@ </rect> </property> <property name="windowTitle" > - <string>QtDBus Chat</string> + <string>Qt D-Bus Chat</string> </property> <widget class="QWidget" name="centralwidget" > <layout class="QHBoxLayout" > diff --git a/examples/dbus/dbus.pro b/examples/dbus/dbus.pro index fd43c23fa3..083e442dfb 100644 --- a/examples/dbus/dbus.pro +++ b/examples/dbus/dbus.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(dbus)) + TEMPLATE = subdirs SUBDIRS = listnames \ pingpong \ diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro index d7d69d3efe..90ee504adf 100644 --- a/examples/embedded/embedded.pro +++ b/examples/embedded/embedded.pro @@ -1,3 +1,5 @@ +requires(if(wince|embedded|x11):qtHaveModule(gui)) + TEMPLATE = subdirs SUBDIRS = styleexample raycasting flickable digiflip diff --git a/examples/examples.pro b/examples/examples.pro index e66226703e..7ba0de9438 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,28 +1,23 @@ TEMPLATE = subdirs CONFIG += no_docs_target -SUBDIRS = \ - gui \ - network \ - threads \ - xml \ - qpa - -qtHaveModule(widgets) { - SUBDIRS += widgets \ - ipc \ - sql \ - tools \ - touch \ - gestures -} - -wince*|embedded|x11:qtHaveModule(gui): SUBDIRS += embedded - -contains(QT_BUILD_PARTS, tools):qtHaveModule(gui):qtHaveModule(widgets): SUBDIRS += qtestlib -qtHaveModule(opengl):qtHaveModule(widgets): SUBDIRS += opengl -qtHaveModule(dbus): SUBDIRS += dbus -qtHaveModule(concurrent): SUBDIRS += qtconcurrent +SUBDIRS = \ + dbus \ + embedded \ + gestures \ + gui \ + ipc \ + network \ + opengl \ + qpa \ + qtconcurrent \ + qtestlib \ + sql \ + threads \ + tools \ + touch \ + widgets \ + xml aggregate.files = aggregate/examples.pro aggregate.path = $$[QT_INSTALL_EXAMPLES] diff --git a/examples/gestures/gestures.pro b/examples/gestures/gestures.pro index 35b60bef38..ecbcf07480 100644 --- a/examples/gestures/gestures.pro +++ b/examples/gestures/gestures.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(widgets)) + TEMPLATE = \ subdirs SUBDIRS = \ diff --git a/examples/gui/doc/src/rasterwindow.qdoc b/examples/gui/doc/src/rasterwindow.qdoc index 61843f2248..4d9586bb9f 100644 --- a/examples/gui/doc/src/rasterwindow.qdoc +++ b/examples/gui/doc/src/rasterwindow.qdoc @@ -1,4 +1,4 @@ -**************************************************************************** +/**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal diff --git a/examples/ipc/ipc.pro b/examples/ipc/ipc.pro index ffa313beef..f302b836af 100644 --- a/examples/ipc/ipc.pro +++ b/examples/ipc/ipc.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(widgets)) + TEMPLATE = subdirs # no QSharedMemory !vxworks:!qnx:SUBDIRS = sharedmemory diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index 25c337fdad..54b0321b26 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(opengl)) + TEMPLATE = subdirs contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){ diff --git a/examples/qtconcurrent/imagescaling/doc/src/qtconcurrent-imagescaling.qdoc b/examples/qtconcurrent/imagescaling/doc/src/qtconcurrent-imagescaling.qdoc index ef6173ef1d..6d7c39526d 100644 --- a/examples/qtconcurrent/imagescaling/doc/src/qtconcurrent-imagescaling.qdoc +++ b/examples/qtconcurrent/imagescaling/doc/src/qtconcurrent-imagescaling.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example qtconcurrent/imagescaling + \example imagescaling \title Image Scaling Example \brief Demonstrates how to asynchronously scale images. \ingroup qtconcurrentexamples diff --git a/examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc b/examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc index fa0ab43059..43c27bd98f 100644 --- a/examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc +++ b/examples/qtconcurrent/map/doc/src/qtconcurrent-map.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example qtconcurrent/map + \example map \title Map Example \brief Demonstrates how to scale images synchronously. \ingroup qtconcurrentexamples diff --git a/examples/qtconcurrent/progressdialog/doc/src/qtconcurrent-progressdialog.qdoc b/examples/qtconcurrent/progressdialog/doc/src/qtconcurrent-progressdialog.qdoc index a2eec5ab40..109bb73bdb 100644 --- a/examples/qtconcurrent/progressdialog/doc/src/qtconcurrent-progressdialog.qdoc +++ b/examples/qtconcurrent/progressdialog/doc/src/qtconcurrent-progressdialog.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example qtconcurrent/progressdialog + \example progressdialog \title QtConcurrent Progress Dialog Example \brief Demonstrates how to monitor the progress of the active processes. \ingroup qtconcurrentexamples diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro index dafbabb5c3..1df6f2d8cf 100644 --- a/examples/qtconcurrent/qtconcurrent.pro +++ b/examples/qtconcurrent/qtconcurrent.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(concurrent)) + TEMPLATE = subdirs SUBDIRS = imagescaling \ map \ diff --git a/examples/qtconcurrent/runfunction/doc/src/qtconcurrent-runfunction.qdoc b/examples/qtconcurrent/runfunction/doc/src/qtconcurrent-runfunction.qdoc index 8ff4d2cef7..0f36dcbd6d 100644 --- a/examples/qtconcurrent/runfunction/doc/src/qtconcurrent-runfunction.qdoc +++ b/examples/qtconcurrent/runfunction/doc/src/qtconcurrent-runfunction.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example qtconcurrent/runfunction + \example runfunction \title Run Function Example \brief Demonstrates how to run standard functions concurrently. \ingroup qtconcurrentexamples diff --git a/examples/qtconcurrent/wordcount/doc/src/qtconcurrent-wordcount.qdoc b/examples/qtconcurrent/wordcount/doc/src/qtconcurrent-wordcount.qdoc index d5b6b93cb5..b45524ca7c 100644 --- a/examples/qtconcurrent/wordcount/doc/src/qtconcurrent-wordcount.qdoc +++ b/examples/qtconcurrent/wordcount/doc/src/qtconcurrent-wordcount.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example qtconcurrent/wordcount + \example wordcount \title QtConcurrent Word Count Example \brief Demonstrates how to use the map-reduce algorithm \ingroup qtconcurrentexamples diff --git a/examples/qtestlib/README b/examples/qtestlib/README index 7ca55b2eb3..d75e8218cd 100644 --- a/examples/qtestlib/README +++ b/examples/qtestlib/README @@ -1,5 +1,5 @@ -The QTestLib framework is a tool for unit testing Qt based applications -and libraries. QTestLib provides all the functionality commonly found +The Qt Test framework is a tool for unit testing Qt based applications +and libraries. Qt Test provides all the functionality commonly found in unit testing frameworks as well as extensions for testing graphical user interfaces. diff --git a/examples/qtestlib/qtestlib.pro b/examples/qtestlib/qtestlib.pro index 383e5aa9e3..4a7663a088 100644 --- a/examples/qtestlib/qtestlib.pro +++ b/examples/qtestlib/qtestlib.pro @@ -1,2 +1,4 @@ +requires(contains(QT_BUILD_PARTS,tools):qtHaveModule(widgets)) + TEMPLATE = subdirs SUBDIRS = tutorial1 tutorial2 tutorial3 tutorial4 tutorial5 diff --git a/examples/sql/sql.pro b/examples/sql/sql.pro index 95bf6404db..eeed18379e 100644 --- a/examples/sql/sql.pro +++ b/examples/sql/sql.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(widgets)) + TEMPLATE = subdirs SUBDIRS = books \ @@ -19,4 +21,3 @@ SUBDIRS = books \ } EXAMPLE_FILES = connection.h - diff --git a/examples/tools/tools.pro b/examples/tools/tools.pro index 10b487d6ae..36fa776980 100644 --- a/examples/tools/tools.pro +++ b/examples/tools/tools.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(widgets)) + TEMPLATE = subdirs CONFIG += ordered SUBDIRS = contiguouscache \ diff --git a/examples/touch/touch.pro b/examples/touch/touch.pro index d5983eb581..018ec134eb 100644 --- a/examples/touch/touch.pro +++ b/examples/touch/touch.pro @@ -1,2 +1,4 @@ +requires(qtHaveModule(widgets)) + TEMPLATE = subdirs SUBDIRS = pinchzoom fingerpaint knobs dials 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 28519b25cc..726494ffd6 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.")); diff --git a/examples/xml/dombookmarks/frank.xbel b/examples/xml/dombookmarks/frank.xbel index 6bd63b8b07..2fd5c2e09d 100644 --- a/examples/xml/dombookmarks/frank.xbel +++ b/examples/xml/dombookmarks/frank.xbel @@ -71,16 +71,16 @@ </folder> <folder folded="no"> <title>Qt</title> - <bookmark href="http://qt.nokia.com/doc/2.3/"> + <bookmark href="http://doc.qt.digia.com/2.3/"> <title>Qt 2.3 Reference</title> </bookmark> - <bookmark href="http://qt.nokia.com/doc/3.3/"> + <bookmark href="http://doc.qt.digia.com/3.3/"> <title>Qt 3.3 Reference</title> </bookmark> - <bookmark href="http://qt.nokia.com/doc/4.0/"> + <bookmark href="http://doc.qt.digia.com/4.0/"> <title>Qt 4.0 Reference</title> </bookmark> - <bookmark href="http://qt.nokia.com/"> + <bookmark href="http://qt-project.org/"> <title>Qt Home Page</title> </bookmark> </folder> diff --git a/examples/xml/dombookmarks/jennifer.xbel b/examples/xml/dombookmarks/jennifer.xbel index 36256fda0a..74b7f1519f 100644 --- a/examples/xml/dombookmarks/jennifer.xbel +++ b/examples/xml/dombookmarks/jennifer.xbel @@ -45,16 +45,16 @@ <title>QtQuestions</title> </bookmark> </folder> - <bookmark href="http://qt.nokia.com/doc/qq/"> + <bookmark href="http://doc.qt.digia.com/qq/"> <title>Qt Quarterly</title> </bookmark> - <bookmark href="http://qt.nokia.com/"> + <bookmark href="http://qt-project.org/"> <title>Qt home page</title> </bookmark> - <bookmark href="http://qt.nokia.com/doc/4.0/"> + <bookmark href="http://doc.qt.digia.com/4.0/"> <title>Qt 4.0 documentation</title> </bookmark> - <bookmark href="http://qt.nokia.com/developer/faqs/"> + <bookmark href="http://qt-project.org/faq/"> <title>Frequently Asked Questions</title> </bookmark> </folder> diff --git a/examples/xml/htmlinfo/simpleexample.html b/examples/xml/htmlinfo/simpleexample.html index 83a55cf00a..d46a494979 100644 --- a/examples/xml/htmlinfo/simpleexample.html +++ b/examples/xml/htmlinfo/simpleexample.html @@ -5,7 +5,7 @@ </head> <body> <p>A paragraph.</p> - <p>A second paragraph. Check out our <a href="http://labs.qt.nokia.com/">developer blogs</a></p> - <p>And the last paragraph. Or our <a href="http://qt.nokia.com/doc/">online documentation</a>.</p> + <p>A second paragraph. Check out our <a href="http://blog.qt.digia.com/">developer blogs</a></p> + <p>And the last paragraph. Or our <a href="http://qt-project.org/doc/">online documentation</a>.</p> </body> </html> diff --git a/examples/xml/rsslisting/rsslisting.cpp b/examples/xml/rsslisting/rsslisting.cpp index 96779b6fd8..2105fe7e10 100644 --- a/examples/xml/rsslisting/rsslisting.cpp +++ b/examples/xml/rsslisting/rsslisting.cpp @@ -76,7 +76,7 @@ RSSListing::RSSListing(QWidget *parent) { lineEdit = new QLineEdit(this); - lineEdit->setText("http://labs.qt.nokia.com/blogs/feed"); + lineEdit->setText("http://blog.qt.digia.com/feed/"); fetchButton = new QPushButton(tr("Fetch"), this); diff --git a/examples/xml/saxbookmarks/frank.xbel b/examples/xml/saxbookmarks/frank.xbel index 6bd63b8b07..2fd5c2e09d 100644 --- a/examples/xml/saxbookmarks/frank.xbel +++ b/examples/xml/saxbookmarks/frank.xbel @@ -71,16 +71,16 @@ </folder> <folder folded="no"> <title>Qt</title> - <bookmark href="http://qt.nokia.com/doc/2.3/"> + <bookmark href="http://doc.qt.digia.com/2.3/"> <title>Qt 2.3 Reference</title> </bookmark> - <bookmark href="http://qt.nokia.com/doc/3.3/"> + <bookmark href="http://doc.qt.digia.com/3.3/"> <title>Qt 3.3 Reference</title> </bookmark> - <bookmark href="http://qt.nokia.com/doc/4.0/"> + <bookmark href="http://doc.qt.digia.com/4.0/"> <title>Qt 4.0 Reference</title> </bookmark> - <bookmark href="http://qt.nokia.com/"> + <bookmark href="http://qt-project.org/"> <title>Qt Home Page</title> </bookmark> </folder> diff --git a/examples/xml/saxbookmarks/jennifer.xbel b/examples/xml/saxbookmarks/jennifer.xbel index d6a5b41d05..d37b8224df 100644 --- a/examples/xml/saxbookmarks/jennifer.xbel +++ b/examples/xml/saxbookmarks/jennifer.xbel @@ -45,16 +45,16 @@ <title>QtQuestions</title> </bookmark> </folder> - <bookmark href="http://qt.nokia.com/doc/qq/"> + <bookmark href="http://doc.qt.digia.com/qq/"> <title>Qt Quarterly</title> </bookmark> - <bookmark href="http://qt.nokia.com/"> + <bookmark href="http://qt-project.org/"> <title>qt home page</title> </bookmark> - <bookmark href="http://qt.nokia.com/doc/4.0/"> + <bookmark href="http://doc.qt.digia.com/4.0/"> <title>Qt 4.0 documentation</title> </bookmark> - <bookmark href="http://qt.nokia.com/developer/faqs/"> + <bookmark href="http://qt-project.org/faq/"> <title>Frequently Asked Questions</title> </bookmark> </folder> diff --git a/examples/xml/streambookmarks/frank.xbel b/examples/xml/streambookmarks/frank.xbel index 6bd63b8b07..2fd5c2e09d 100644 --- a/examples/xml/streambookmarks/frank.xbel +++ b/examples/xml/streambookmarks/frank.xbel @@ -71,16 +71,16 @@ </folder> <folder folded="no"> <title>Qt</title> - <bookmark href="http://qt.nokia.com/doc/2.3/"> + <bookmark href="http://doc.qt.digia.com/2.3/"> <title>Qt 2.3 Reference</title> </bookmark> - <bookmark href="http://qt.nokia.com/doc/3.3/"> + <bookmark href="http://doc.qt.digia.com/3.3/"> <title>Qt 3.3 Reference</title> </bookmark> - <bookmark href="http://qt.nokia.com/doc/4.0/"> + <bookmark href="http://doc.qt.digia.com/4.0/"> <title>Qt 4.0 Reference</title> </bookmark> - <bookmark href="http://qt.nokia.com/"> + <bookmark href="http://qt-project.org/"> <title>Qt Home Page</title> </bookmark> </folder> diff --git a/examples/xml/streambookmarks/jennifer.xbel b/examples/xml/streambookmarks/jennifer.xbel index 36256fda0a..74b7f1519f 100644 --- a/examples/xml/streambookmarks/jennifer.xbel +++ b/examples/xml/streambookmarks/jennifer.xbel @@ -45,16 +45,16 @@ <title>QtQuestions</title> </bookmark> </folder> - <bookmark href="http://qt.nokia.com/doc/qq/"> + <bookmark href="http://doc.qt.digia.com/qq/"> <title>Qt Quarterly</title> </bookmark> - <bookmark href="http://qt.nokia.com/"> + <bookmark href="http://qt-project.org/"> <title>Qt home page</title> </bookmark> - <bookmark href="http://qt.nokia.com/doc/4.0/"> + <bookmark href="http://doc.qt.digia.com/4.0/"> <title>Qt 4.0 documentation</title> </bookmark> - <bookmark href="http://qt.nokia.com/developer/faqs/"> + <bookmark href="http://qt-project.org/faq/"> <title>Frequently Asked Questions</title> </bookmark> </folder> |