From 309e82021de1b49753559086592749d9fe02b239 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Fri, 24 Oct 2014 14:09:41 +0400 Subject: Doc: Include QtWidgets instead of QtGui Change-Id: Ib7f3183efd446abb7cc191f33128b4e230ee372c Reviewed-by: Jerome Pasion --- examples/widgets/doc/src/application.qdoc | 6 +++--- examples/widgets/doc/src/dockwidgets.qdoc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'examples') diff --git a/examples/widgets/doc/src/application.qdoc b/examples/widgets/doc/src/application.qdoc index 0d244bce00..e0379e9d75 100644 --- a/examples/widgets/doc/src/application.qdoc +++ b/examples/widgets/doc/src/application.qdoc @@ -75,12 +75,12 @@ \snippet mainwindows/application/mainwindow.cpp 0 - We start by including \c , a header file that contains the - definition of all classes in the Qt Core and Qt GUI + We start by including \c , a header file that contains the + definition of all classes in the Qt Core, Qt GUI and Qt Widgets modules. This saves us from the trouble of having to include every class individually. We also include \c mainwindow.h. - You might wonder why we don't include \c in \c + You might wonder why we don't include \c in \c mainwindow.h and be done with it. The reason is that including such a large header from another header file can rapidly degrade performances. Here, it wouldn't do any harm, but it's still diff --git a/examples/widgets/doc/src/dockwidgets.qdoc b/examples/widgets/doc/src/dockwidgets.qdoc index 2987ec1211..a11524f4f4 100644 --- a/examples/widgets/doc/src/dockwidgets.qdoc +++ b/examples/widgets/doc/src/dockwidgets.qdoc @@ -55,8 +55,8 @@ \snippet mainwindows/dockwidgets/mainwindow.cpp 0 - We start by including \c , a header file that contains the - definition of all classes in the Qt Core and Qt GUI + We start by including \c , a header file that contains the + definition of all classes in the Qt Core, Qt GUI and Qt Widgets modules. This saves us from having to include every class individually and is especially convenient if we add new widgets. We also include \c mainwindow.h. -- cgit v1.2.3 From 41ece1cbc120db5c7f51f08629845d5dfa2f34b8 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Fri, 24 Oct 2014 14:45:03 +0400 Subject: Fix includes in mousebuttons example Remove QtWidgets from buttontester.h and QtGui from main.cpp. Change-Id: Ie5925a33c58c1abd9747ab0ab7040e7d1b0769a9 Reviewed-by: Friedemann Kleint --- examples/widgets/widgets/mousebuttons/buttontester.cpp | 2 ++ examples/widgets/widgets/mousebuttons/buttontester.h | 2 -- examples/widgets/widgets/mousebuttons/main.cpp | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/widgets/widgets/mousebuttons/buttontester.cpp b/examples/widgets/widgets/mousebuttons/buttontester.cpp index 41c6c95adf..51287f541b 100644 --- a/examples/widgets/widgets/mousebuttons/buttontester.cpp +++ b/examples/widgets/widgets/mousebuttons/buttontester.cpp @@ -41,6 +41,8 @@ #include "buttontester.h" +#include + void ButtonTester::mousePressEvent(QMouseEvent *e) { int j = ButtonTester::buttonByNumber (e->button()); diff --git a/examples/widgets/widgets/mousebuttons/buttontester.h b/examples/widgets/widgets/mousebuttons/buttontester.h index 9e7011ac9a..41ae8d0582 100644 --- a/examples/widgets/widgets/mousebuttons/buttontester.h +++ b/examples/widgets/widgets/mousebuttons/buttontester.h @@ -41,10 +41,8 @@ #ifndef BUTTONTESTER_H #define BUTTONTESTER_H -#include #include #include -#include #include #include diff --git a/examples/widgets/widgets/mousebuttons/main.cpp b/examples/widgets/widgets/mousebuttons/main.cpp index 184547113e..b5446df9e9 100644 --- a/examples/widgets/widgets/mousebuttons/main.cpp +++ b/examples/widgets/widgets/mousebuttons/main.cpp @@ -40,7 +40,10 @@ ****************************************************************************/ #include "buttontester.h" -#include + +#include +#include +#include int main(int argv, char **args) { -- cgit v1.2.3 From 44654675ed9e284c090029611822f6e93828440a Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Sun, 26 Oct 2014 10:08:38 +1000 Subject: Do not add invalid configurations to bearermonitor If the list of configurations takes time in the backend, the defaultConfiguration will be invalid at this time, but will be updated by the backend. Change-Id: I2886a8f6c569c993814172ccaa46e4bb5ba5e0d6 Reviewed-by: Alex Blasche --- examples/network/bearermonitor/bearermonitor.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'examples') diff --git a/examples/network/bearermonitor/bearermonitor.cpp b/examples/network/bearermonitor/bearermonitor.cpp index 4590a91f4f..2f5d6cda1c 100644 --- a/examples/network/bearermonitor/bearermonitor.cpp +++ b/examples/network/bearermonitor/bearermonitor.cpp @@ -127,6 +127,9 @@ static void updateItem(QTreeWidgetItem *item, const QNetworkConfiguration &confi void BearerMonitor::configurationAdded(const QNetworkConfiguration &config, QTreeWidgetItem *parent) { + if (!config.isValid()) + return; + QTreeWidgetItem *item = new QTreeWidgetItem; updateItem(item, config); -- cgit v1.2.3 From 7567e09389fffdf8901aed6501744dd0fcf4a72d Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Sun, 19 Oct 2014 18:33:11 +0200 Subject: Doc: Updated thumbnail images for some examples. -Application Example -Analog Clock -Analog Clock Window -Scribble -Digital Clock -Thumbnail images were created with an obscure window manager and they look out of place in the Welcome Mode in Qt Creator. -Used Windows 7 as the platform. -Images within the documentation not updated because they are still relevant. Task-number: QTBUG-33597 Change-Id: I255fc4960e9adcec273f21287ef2182656c6b007 Reviewed-by: Venugopal Shivashankar Reviewed-by: Jerome Pasion --- .../gui/doc/images/analogclock-window-example.png | Bin 2383 -> 14556 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'examples') diff --git a/examples/gui/doc/images/analogclock-window-example.png b/examples/gui/doc/images/analogclock-window-example.png index ffd7baa716..f5e92e400a 100644 Binary files a/examples/gui/doc/images/analogclock-window-example.png and b/examples/gui/doc/images/analogclock-window-example.png differ -- cgit v1.2.3 From 68d4eec30b84009672103574aa4b09ef259a420a Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 28 Oct 2014 16:20:09 +0100 Subject: Use exising host / port for securesocketclient example Change-Id: I321622b393ea1f452805299d74a28d12270b2238 Reviewed-by: Richard J. Moore --- examples/network/securesocketclient/sslclient.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/network/securesocketclient/sslclient.ui b/examples/network/securesocketclient/sslclient.ui index 4b81fe46eb..19bae83a09 100644 --- a/examples/network/securesocketclient/sslclient.ui +++ b/examples/network/securesocketclient/sslclient.ui @@ -26,7 +26,7 @@ - imap.example.com + www.qt.io @@ -46,7 +46,7 @@ 65535 - 993 + 443 -- cgit v1.2.3 From a5c624622becc8cdf5a1bcd6f8b8e3c1cca53371 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 28 Oct 2014 16:17:19 +0100 Subject: Fix compiler warning in securesocketclient example The warning was introduced in a133cea2 . Change-Id: Ia8180b6c7d83f57cba79519bf4c0e3bf97966c16 Reviewed-by: Richard J. Moore --- examples/network/securesocketclient/sslclient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/network/securesocketclient/sslclient.cpp b/examples/network/securesocketclient/sslclient.cpp index 23ca7e41e7..0cec70c742 100644 --- a/examples/network/securesocketclient/sslclient.cpp +++ b/examples/network/securesocketclient/sslclient.cpp @@ -181,7 +181,7 @@ void SslClient::sendData() form->sessionInput->clear(); } -void SslClient::socketError(QAbstractSocket::SocketError error) +void SslClient::socketError(QAbstractSocket::SocketError) { QMessageBox::critical(this, tr("Connection error"), socket->errorString()); } -- cgit v1.2.3 From 82e266a83b8124df327001906d2848f625effbc6 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 31 Oct 2014 13:46:01 +0100 Subject: New Qt logo This patch replaces the old Qt logo with the new, flatter one. The PNGs were optimized via: optipng -o7 -strip "all" Task-number: QTBUG-41685 Change-Id: I51983a45144373bf7aee31a32990ecbb2582f488 Reviewed-by: Robert Loehning Reviewed-by: Friedemann Kleint Reviewed-by: Kai Koehne Reviewed-by: Lars Knoll --- .../opengl/legacy/framebufferobject2/cubelogo.png | Bin 5920 -> 2884 bytes examples/opengl/legacy/pbuffers/cubelogo.png | Bin 5920 -> 2884 bytes examples/sql/doc/images/drilldown-example.png | Bin 52950 -> 9092 bytes examples/sql/drilldown/images/qt-creator.png | Bin 46906 -> 6655 bytes examples/sql/drilldown/images/qt-logo.png | Bin 45652 -> 5527 bytes examples/sql/drilldown/images/qt-project.png | Bin 37795 -> 16832 bytes examples/sql/drilldown/images/qt-quick.png | Bin 43238 -> 26635 bytes .../animation/animatedtiles/images/kinetic.png | Bin 6776 -> 5055 bytes .../widgets/animation/easing/images/qt-logo.png | Bin 5149 -> 1495 bytes examples/widgets/doc/images/dropsite-example.png | Bin 36033 -> 29056 bytes .../widgets/doc/images/icons_qt_extended_16x16.png | Bin 1184 -> 563 bytes .../widgets/doc/images/icons_qt_extended_17x17.png | Bin 1219 -> 605 bytes .../widgets/doc/images/icons_qt_extended_32x32.png | Bin 2185 -> 916 bytes .../widgets/doc/images/icons_qt_extended_33x33.png | Bin 2435 -> 975 bytes .../widgets/doc/images/icons_qt_extended_48x48.png | Bin 3805 -> 1270 bytes .../widgets/doc/images/icons_qt_extended_64x64.png | Bin 3805 -> 1614 bytes .../widgets/doc/images/icons_qt_extended_8x8.png | Bin 685 -> 340 bytes examples/widgets/draganddrop/puzzle/example.jpg | Bin 42654 -> 42654 bytes examples/widgets/graphicsview/boxes/qt-logo.jpg | Bin 40886 -> 20316 bytes examples/widgets/graphicsview/boxes/qt-logo.png | Bin 13923 -> 12167 bytes examples/widgets/itemviews/puzzle/example.jpg | Bin 42654 -> 42654 bytes .../painting/basicdrawing/images/qt-logo.png | Bin 3696 -> 1831 bytes .../widgets/icons/images/qt_extended_16x16.png | Bin 834 -> 524 bytes .../widgets/icons/images/qt_extended_32x32.png | Bin 1892 -> 892 bytes .../widgets/icons/images/qt_extended_48x48.png | Bin 3672 -> 1294 bytes 25 files changed, 0 insertions(+), 0 deletions(-) (limited to 'examples') diff --git a/examples/opengl/legacy/framebufferobject2/cubelogo.png b/examples/opengl/legacy/framebufferobject2/cubelogo.png index 3ae0f9ba3f..2ccbede774 100644 Binary files a/examples/opengl/legacy/framebufferobject2/cubelogo.png and b/examples/opengl/legacy/framebufferobject2/cubelogo.png differ diff --git a/examples/opengl/legacy/pbuffers/cubelogo.png b/examples/opengl/legacy/pbuffers/cubelogo.png index 3ae0f9ba3f..2ccbede774 100644 Binary files a/examples/opengl/legacy/pbuffers/cubelogo.png and b/examples/opengl/legacy/pbuffers/cubelogo.png differ diff --git a/examples/sql/doc/images/drilldown-example.png b/examples/sql/doc/images/drilldown-example.png index fd315a437e..fed51d3629 100644 Binary files a/examples/sql/doc/images/drilldown-example.png and b/examples/sql/doc/images/drilldown-example.png differ diff --git a/examples/sql/drilldown/images/qt-creator.png b/examples/sql/drilldown/images/qt-creator.png index fa0f6ed7ce..0602bdcad1 100644 Binary files a/examples/sql/drilldown/images/qt-creator.png and b/examples/sql/drilldown/images/qt-creator.png differ diff --git a/examples/sql/drilldown/images/qt-logo.png b/examples/sql/drilldown/images/qt-logo.png index 53bc39c38c..7603fa0c90 100644 Binary files a/examples/sql/drilldown/images/qt-logo.png and b/examples/sql/drilldown/images/qt-logo.png differ diff --git a/examples/sql/drilldown/images/qt-project.png b/examples/sql/drilldown/images/qt-project.png index c34d3f099d..e066fbe3f9 100644 Binary files a/examples/sql/drilldown/images/qt-project.png and b/examples/sql/drilldown/images/qt-project.png differ diff --git a/examples/sql/drilldown/images/qt-quick.png b/examples/sql/drilldown/images/qt-quick.png index f66127e8e7..90d9fd075d 100644 Binary files a/examples/sql/drilldown/images/qt-quick.png and b/examples/sql/drilldown/images/qt-quick.png differ diff --git a/examples/widgets/animation/animatedtiles/images/kinetic.png b/examples/widgets/animation/animatedtiles/images/kinetic.png index 55cfa5515f..d5fc0af0f2 100644 Binary files a/examples/widgets/animation/animatedtiles/images/kinetic.png and b/examples/widgets/animation/animatedtiles/images/kinetic.png differ diff --git a/examples/widgets/animation/easing/images/qt-logo.png b/examples/widgets/animation/easing/images/qt-logo.png index 14ddf2a028..6b72d5fb72 100644 Binary files a/examples/widgets/animation/easing/images/qt-logo.png and b/examples/widgets/animation/easing/images/qt-logo.png differ diff --git a/examples/widgets/doc/images/dropsite-example.png b/examples/widgets/doc/images/dropsite-example.png index 2c42c7be69..c555dd3609 100644 Binary files a/examples/widgets/doc/images/dropsite-example.png and b/examples/widgets/doc/images/dropsite-example.png differ diff --git a/examples/widgets/doc/images/icons_qt_extended_16x16.png b/examples/widgets/doc/images/icons_qt_extended_16x16.png index 92743690e3..8bae9499e4 100644 Binary files a/examples/widgets/doc/images/icons_qt_extended_16x16.png and b/examples/widgets/doc/images/icons_qt_extended_16x16.png differ diff --git a/examples/widgets/doc/images/icons_qt_extended_17x17.png b/examples/widgets/doc/images/icons_qt_extended_17x17.png index e9bb24a282..7ef4222f93 100644 Binary files a/examples/widgets/doc/images/icons_qt_extended_17x17.png and b/examples/widgets/doc/images/icons_qt_extended_17x17.png differ diff --git a/examples/widgets/doc/images/icons_qt_extended_32x32.png b/examples/widgets/doc/images/icons_qt_extended_32x32.png index cd3d0f3255..7b0c54bac3 100644 Binary files a/examples/widgets/doc/images/icons_qt_extended_32x32.png and b/examples/widgets/doc/images/icons_qt_extended_32x32.png differ diff --git a/examples/widgets/doc/images/icons_qt_extended_33x33.png b/examples/widgets/doc/images/icons_qt_extended_33x33.png index a67565cc2b..1a38f6e44b 100644 Binary files a/examples/widgets/doc/images/icons_qt_extended_33x33.png and b/examples/widgets/doc/images/icons_qt_extended_33x33.png differ diff --git a/examples/widgets/doc/images/icons_qt_extended_48x48.png b/examples/widgets/doc/images/icons_qt_extended_48x48.png index 5aa2d73f71..85dcb5f26c 100644 Binary files a/examples/widgets/doc/images/icons_qt_extended_48x48.png and b/examples/widgets/doc/images/icons_qt_extended_48x48.png differ diff --git a/examples/widgets/doc/images/icons_qt_extended_64x64.png b/examples/widgets/doc/images/icons_qt_extended_64x64.png index 5aa2d73f71..d0bfd97f10 100644 Binary files a/examples/widgets/doc/images/icons_qt_extended_64x64.png and b/examples/widgets/doc/images/icons_qt_extended_64x64.png differ diff --git a/examples/widgets/doc/images/icons_qt_extended_8x8.png b/examples/widgets/doc/images/icons_qt_extended_8x8.png index 8de7fce038..dcbb5811c6 100644 Binary files a/examples/widgets/doc/images/icons_qt_extended_8x8.png and b/examples/widgets/doc/images/icons_qt_extended_8x8.png differ diff --git a/examples/widgets/draganddrop/puzzle/example.jpg b/examples/widgets/draganddrop/puzzle/example.jpg index e09fb70757..023203c57a 100644 Binary files a/examples/widgets/draganddrop/puzzle/example.jpg and b/examples/widgets/draganddrop/puzzle/example.jpg differ diff --git a/examples/widgets/graphicsview/boxes/qt-logo.jpg b/examples/widgets/graphicsview/boxes/qt-logo.jpg index 4014b4659c..8d7fab052a 100644 Binary files a/examples/widgets/graphicsview/boxes/qt-logo.jpg and b/examples/widgets/graphicsview/boxes/qt-logo.jpg differ diff --git a/examples/widgets/graphicsview/boxes/qt-logo.png b/examples/widgets/graphicsview/boxes/qt-logo.png index 7d3e97eb36..0b0b15480c 100644 Binary files a/examples/widgets/graphicsview/boxes/qt-logo.png and b/examples/widgets/graphicsview/boxes/qt-logo.png differ diff --git a/examples/widgets/itemviews/puzzle/example.jpg b/examples/widgets/itemviews/puzzle/example.jpg index e09fb70757..023203c57a 100644 Binary files a/examples/widgets/itemviews/puzzle/example.jpg and b/examples/widgets/itemviews/puzzle/example.jpg differ diff --git a/examples/widgets/painting/basicdrawing/images/qt-logo.png b/examples/widgets/painting/basicdrawing/images/qt-logo.png index a8b452e07a..abfc8caadb 100644 Binary files a/examples/widgets/painting/basicdrawing/images/qt-logo.png and b/examples/widgets/painting/basicdrawing/images/qt-logo.png differ diff --git a/examples/widgets/widgets/icons/images/qt_extended_16x16.png b/examples/widgets/widgets/icons/images/qt_extended_16x16.png index 95d3bae838..bee4e7d6cd 100644 Binary files a/examples/widgets/widgets/icons/images/qt_extended_16x16.png and b/examples/widgets/widgets/icons/images/qt_extended_16x16.png differ diff --git a/examples/widgets/widgets/icons/images/qt_extended_32x32.png b/examples/widgets/widgets/icons/images/qt_extended_32x32.png index 7b7a790c12..6e7d000c04 100644 Binary files a/examples/widgets/widgets/icons/images/qt_extended_32x32.png and b/examples/widgets/widgets/icons/images/qt_extended_32x32.png differ diff --git a/examples/widgets/widgets/icons/images/qt_extended_48x48.png b/examples/widgets/widgets/icons/images/qt_extended_48x48.png index 8434dc26db..7a93d88900 100644 Binary files a/examples/widgets/widgets/icons/images/qt_extended_48x48.png and b/examples/widgets/widgets/icons/images/qt_extended_48x48.png differ -- cgit v1.2.3