From f262815f2ef147113780312a410eccdf4b318a82 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sat, 26 Jan 2013 13:39:56 +0100 Subject: Fix some more old references and links to Nokia Task-number: QTBUG-28156 Change-Id: I9ba0d6f1e92103219bec1e61e716b6b2f269a8ad Reviewed-by: Laszlo Papp Reviewed-by: Jerome Pasion --- examples/widgets/doc/src/codeeditor.qdoc | 2 +- examples/widgets/doc/src/syntaxhighlighter.qdoc | 2 +- examples/widgets/tutorials/addressbook-fr/README | 2 +- examples/widgets/tutorials/addressbook/README | 2 +- examples/widgets/widgets/stylesheet/mainwindow.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'examples/widgets') diff --git a/examples/widgets/doc/src/codeeditor.qdoc b/examples/widgets/doc/src/codeeditor.qdoc index 95b75cc82b..a4d1f46a58 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 b417499f6f..ff2b20cad9 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/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/stylesheet/mainwindow.cpp b/examples/widgets/widgets/stylesheet/mainwindow.cpp index df14090f5b..b1444ad069 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 Style Sheet example shows how widgets can be styled " - "using Qt " + "using Qt " "Style Sheets. Click File|Edit Style Sheet to pop up the " "style editor, and either choose an existing style sheet or design " "your own.")); -- cgit v1.2.3 From b644ed510af512c5688f139317249eea869e2853 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 24 Jan 2013 22:12:17 +0100 Subject: don't build shared demo library which is not used anyway this amends 5a2fc03ef4 Change-Id: I42b2141ad33b75041ee2bb58af642fc3d07f290e Reviewed-by: hjk Reviewed-by: Joerg Bornemann --- examples/widgets/painting/painting.pro | 27 +++++++-------------------- examples/widgets/painting/shared/shared.pro | 26 -------------------------- 2 files changed, 7 insertions(+), 46 deletions(-) delete mode 100644 examples/widgets/painting/shared/shared.pro (limited to 'examples/widgets') 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 -- cgit v1.2.3 From 6c9e2219aca80e4fd426c9364eb93a880e9052ca Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 21 Dec 2012 14:14:40 +0100 Subject: push feature conditionals down to subdirectories the top-level project is not installed, and the meta-project which is used instead does not know anything about conditionals. Task-number: QTBUG-28414 Change-Id: Id5785ab5f92373ece74699e3c28220fc7f9689ac Reviewed-by: Joerg Bornemann --- examples/widgets/widgets.pro | 2 ++ 1 file changed, 2 insertions(+) (limited to 'examples/widgets') 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 -- cgit v1.2.3 From 8f61befb532b1f9daf5a9aa7ab2bca5cdcdd9edb Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 28 Jan 2013 11:59:57 +0100 Subject: fix install locations of examples/widgets/tools amends cb961007c5 Change-Id: I725042c55816832eeb5b0d8a3522911877279aae Reviewed-by: Joerg Bornemann --- examples/widgets/tools/codecs/codecs.pro | 2 +- examples/widgets/tools/completer/completer.pro | 2 +- examples/widgets/tools/customcompleter/customcompleter.pro | 2 +- examples/widgets/tools/echoplugin/echoplugin.pro | 2 +- examples/widgets/tools/echoplugin/echowindow/echowindow.pro | 2 +- examples/widgets/tools/echoplugin/plugin/plugin.pro | 2 +- examples/widgets/tools/i18n/i18n.pro | 2 +- examples/widgets/tools/plugandpaint/plugandpaint.pro | 2 +- examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro | 2 +- .../widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro | 2 +- examples/widgets/tools/regexp/regexp.pro | 2 +- examples/widgets/tools/settingseditor/settingseditor.pro | 2 +- examples/widgets/tools/styleplugin/plugin/plugin.pro | 2 +- examples/widgets/tools/styleplugin/styleplugin.pro | 2 +- examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro | 2 +- examples/widgets/tools/treemodelcompleter/treemodelcompleter.pro | 2 +- examples/widgets/tools/undo/undo.pro | 2 +- examples/widgets/tools/undoframework/undoframework.pro | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) (limited to 'examples/widgets') 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) -- cgit v1.2.3