summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Build examples and tests only if their requirements are metUlf Hermann2017-03-223-11/+11
| | | | | | | | | | | | | | | If the respective modules aren't available we cannot build the tests and examples. We drop the qtConfig(opengl) requirement for the opengl examples as a, we would need to make the QtGui configuration available for that to work, and b, we should not add too much detail to the tests and examples build configurations. Checking each test and example for every feature it uses would be too much. Task-number: QTBUG-57255 Change-Id: Ifb043c81ec9e5c487765297bd65704812cd281fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Example: migrate treemodelcompleter example to use QRegularExpressionSamuel Gaist2017-03-071-4/+5
| | | | | | | | Update the treemodelcompleter example to use the new QRegularExpression class in place of the deprecated QRegExp. Change-Id: I9fa91ca6e847603de37019e4ca86fc69a51a3772 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* Example: fix memory leak in relationnaltablemodel exampleSamuel Gaist2017-03-071-1/+1
| | | | | | | | The example creates a view on the heap but doesn't delete it on application end. This patch uses a QScopedPointer to fix that. Change-Id: I3b0c8589999d243c193bd02e1470c03eabfabe40 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* Fix building of various examples and tools with -no-feature-processUlf Hermann2017-03-062-3/+2
| | | | | | | | We should not check for platforms, but rather for features. Also, if dbus is available it doesn't automatically mean that QProcess is. Change-Id: I27ef5863fcb107cca1aa47abba95b734962adc33 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* use regular configure mechanism for openssl library referencesOswald Buddenhagen2017-02-221-1/+0
| | | | | | | | | | | | don't attempt to hand-craft a library export any more. instead, use the configure system's built-in mechanism, and refer to it via QMAKE_USE. this also allows us to rely on transitive dependencies in the autotest. as a side effect, this makes the openssl-linked feature imply the openssl one. Change-Id: I5dd209b63bc8fbbc62852f6ffc472d4452ea2e68 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Example: migrate flightinfo to QRegularExpressionSamuel Gaist2017-02-151-3/+3
| | | | | | | | Update the flightinfo example to use the new QRegularExpression class in place of the deprecated QRegExp. Change-Id: I2395b37170565e922500e675210c400e90ae0f73 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* Example: migrate grabber to use QRegularExpressionSamuel Gaist2017-02-151-4/+5
| | | | | | | | Update the legacy grabber example to use the new QRegularExpression class in place of the deprecated QRegExp. Change-Id: I1d1871b7e82cdb214fdd8ad55a606d5e7682fab1 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* Example: migrate the arthur code sample to use QRegularExpressionSamuel Gaist2017-02-151-5/+4
| | | | | | | | Update the arthur code sample to use the new QRegularExpression class in place of the deprecated QRegExp. Change-Id: Ic7efd4466b4c0fa50170b80ebb22fcb3624399ce Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* Example: migrate the codecs example to use QRegularExpressionSamuel Gaist2017-02-151-3/+4
| | | | | | | | Update the codecs example to use the new QRegularExpression class in place of the deprecated QRegExp. Change-Id: Ibd60b7256071f8166c4bf38e6a40935494c3cf3f Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* Example: migrate settingseditor example to use QRegularExpressionSamuel Gaist2017-02-152-33/+34
| | | | | | | | Update the settingseditor example to use the new QRegularExpression class in place of the deprecated QRegExp. Change-Id: I07e34bf916bdde161c4253fca70b853061cd589b Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* Example: migrate stylesheet example to use QRegularExpressionSamuel Gaist2017-02-151-3/+4
| | | | | | | | Update the stylesheet example to use the new QRegularExpression class in place of the deprecated QRegExp. Change-Id: I7061b8fd462ff012cb67bfdade656b3bfe442dd8 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* QXmlStream{Reader,Writer} don't need QtXmlThiago Macieira2017-01-311-1/+0
| | | | | | | They're in QtCore. Change-Id: I63e21df51c7448bc8b5ffffd148f03c5e80b6fea Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Example: migrate the classwizard example to use QRegularExpressionSamuel Gaist2017-01-241-1/+2
| | | | | | | | Update the classwizard example to use the new QRegularExpression class in place of the deprecated QRegExp. Change-Id: I125664549e249c4156f8c664fac7648f1c41f9d5 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* Example: migrate licensewizard example to use QRegularExpressionSamuel Gaist2017-01-241-2/+4
| | | | | | | | Update the licensewizard example to use the new QRegularExpression class in place of the deprecated QRegExp. Change-Id: Ib6e0ee9ec802e83540b1c37846b99378395fe0ec Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* Doc: Fixed old text still mentioning QRegExpSamuel Gaist2017-01-241-2/+2
| | | | | | | | | The example has already been ported to QRegularExpression however part of the documentation still referred to the QRegExp class. This patch updates the documentation to match the new version of the code. Change-Id: Id433d0b28deae0c4f702c0c54d2704174f8c7689 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* Tutorial: migrate addressbook tutorial to use QRegularExpressionSamuel Gaist2017-01-241-1/+1
| | | | | | | | Update the addressbook tutorial to use the new QRegularExpression class in place of the deprecated QRegExp. Change-Id: Ibea9252ab8fe1d12e6fc862fa70229ca6efe0804 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* Example: migrate network-chat to use QRegularExpressionSamuel Gaist2017-01-231-1/+1
| | | | | | | | Update the network-chat example to use the new QRegularExpression class in place of the deprecated QRegExp. Change-Id: Idcd3dc5b3e9b520b2eeef9565d50195cc8dffd06 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* examples: Use lambdas instead of functor classesAlexander Volkov2017-01-092-25/+4
| | | | | | Change-Id: Iee2cc22a9239ab5a351cb5ecb2c8ce10ed019b2c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix compilation without sharedmemoryUlf Hermann2017-01-051-2/+2
| | | | | | | | | | | We have to enable qt_safe_ftok with either sharedmemory or systemsemaphore. In order to make the resulting QT_CONFIG work with the bootstrap library we switch the features off for bootstrapping. Some tests and examples have to be excluded when sharedmemory is not available. Change-Id: I3fc3926d160202b378be2293fba40201a4bf50c5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* prune vestiges of DEPLOYMENT_PLUGINOswald Buddenhagen2016-12-233-9/+0
| | | | | | | | | | | | | | | the code was broken since 5.0, as it still hardcoded the version number 4 for the plugin basenames. wince is not supported any more, so there is no point in trying to restore the code to function. at a later point, we'll make QTPLUGIN universal enough to cover both static and dynamic deployment. Change-Id: I0911ce4aff7a799dd471d6218e046f13dca6d49e Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* examples: Use QOverload to select overloaded signals and slotsAlexander Volkov2016-12-2215-52/+28
| | | | | | | | | | | We can use QOverload since Qt 5.7 (it depends on Q_COMPILER_VARIADIC_TEMPLATES which is required since Qt 5.7). Use it in the examples to show the best practice. qOverload currently can't be used because it requires c++14. Change-Id: I94a3c0db9d551fe169fa3d19c07ec0b329d5946c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2016-12-162-6/+10
|\ | | | | | | | | | | | | | | | | Conflicts: doc/global/qt-cpp-defines.qdocconf src/plugins/platforms/android/qandroidplatformopenglcontext.h src/plugins/platforms/android/qandroidplatformtheme.h Change-Id: I13d51cc66f708138ff4d667ceea7d515992e58a4
| * Fix compilation on platforms that don't support printingLars Knoll2016-12-012-6/+10
| | | | | | | | | | | | Task-number: QTBUG-56259 Change-Id: Ice1d7601494b01b387e787da412cd94b6717ebde Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Doc: update Qt Widgets examplesNico Vertriest2016-12-1221-21/+33
| | | | | | | | | | | | | | | | - \image --> \borderedimage - update screenshot if required Change-Id: I0318b1df67154b70c061da7cbd509b8d5337b311 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Examples: Remove more redundant virtual specifiers for overridersAlexander Volkov2016-11-293-5/+5
|/ | | | | Change-Id: I3e378c656a2651fb7031b6cf6a6939dfc5576519 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Examples: Remove a redundant virtual specifier for overridersAlexander Volkov2016-11-2521-71/+71
| | | | | | | | It's a good practice to use override without virtual: https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#Rh-override Change-Id: I5c2d73600e6c706424589c0487133c03a4ef3629 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix compilation without QPrinter supportMaurice Kalinowski2016-11-233-6/+2
| | | | | | Task-number: QTBUG-56321 Change-Id: Ic77d01431ee58d609eca895d1f2d216042406bc9 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix SCTP API according to Qt conventionsFriedemann Kleint2016-11-221-1/+1
| | | | | | | | inDatagramMode() -> isInDatagramMode() maxChannelCount -> maximumChannelCount Change-Id: Ib64bf52cc3b40354927ee11e3f41d47e84c6d9c4 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Remove last traces of opengl es 1 supportLars Knoll2016-11-161-4/+0
| | | | | Change-Id: I3f86d4892ec3235003d34fdcf3f093f1513c821f Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Clean up some conditions in our pro filesLars Knoll2016-11-141-3/+1
| | | | | | | | Change qtConfig(opengl(es2)?) to qtConfig(opengl) as that covers the case without any regular expression. Change-Id: I935e3150f87e195e8bd3d0e55b4ed43572b131cf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Doc: update SQL examplesNico Vertriest2016-11-0920-11/+11
| | | | | | | | - screenshot: remove OS-dependent part of window - \image --> \borderedimage Change-Id: I3eb98595e5c2eb254d3857e4c81dfedac8b7939e Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-086-819/+57
|\ | | | | | | | | | | | | Conflicts: src/corelib/tools/qalgorithms.h Change-Id: Ib8ce4d5d9ecd5b9c166d5b8b44e58f3e4e7283ff
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-046-819/+57
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/json/qjsonparser.cpp src/gui/opengl/qopengl.cpp Change-Id: Ib4d3208398399691839e6c6eaeb9006f99e3a62b
| | * Update bookmarks in the XML bookmarks examplesFriedemann Kleint2016-11-016-819/+57
| | | | | | | | | | | | | | | | | | | | | | | | Update URLs in jennifer.xbel and remove frank.xbel, which has too many outdated URLs Change-Id: I8cbc1e3988f45230f849e68202780c76cf4353d9 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-011-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/win/msvc_version.cpp configure.pri mkspecs/macx-ios-clang/features/default_post.prf mkspecs/macx-ios-clang/features/resolve_config.prf mkspecs/features/uikit/default_post.prf mkspecs/features/uikit/resolve_config.prf src/corelib/io/qsettings_mac.cpp src/corelib/json/qjsondocument.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/cocoa/qnswindowdelegate.h src/plugins/platforms/cocoa/qnswindowdelegate.mm src/plugins/platforms/ios/ios.pro src/plugins/platforms/ios/kernel.pro src/plugins/platforms/ios/qiosintegration.h src/plugins/platforms/minimalegl/qminimaleglintegration.cpp tests/auto/gui/painting/qpainter/tst_qpainter.cpp tools/configure/environment.cpp Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-311-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/minimalegl/qminimaleglintegration.cpp Change-Id: Ia6ab42a6daadbf8abc085c971545904d49ea4b56
| | * Doc: Fix typos: handing > handlingTopi Reinio2016-10-281-1/+1
| | | | | | | | | | | | | | | Change-Id: Iecc64cba620ec639d06684e30264171052f21e10 Reviewed-by: Nico Vertriest <nico.vertriest@theqtcompany.com>
* | | remove bogus qtConfig(simulator_and_device) conditionOswald Buddenhagen2016-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | xcode variable expansion should be done exactly when xcode is used. Change-Id: Icea8cb7bf9a51811052789bd66354b1b165127d6 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | remove bogus xcode variable referenceOswald Buddenhagen2016-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | this is a vestige from an earlier version of the watchos introduction. amends 57378a108. Change-Id: I7d15149b94d12d84e041079b563175bd4e385d50 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Get rid of simulator_and_device CONFIG option (mostly)Oswald Buddenhagen2016-10-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A separate flag is no longer needed now that simulator and device builds are not exclusive any more (*) - both 'simulator' and 'device' being set at the same time is a sufficient indication (uikit/default_pre.prf sets this up according to the simulator_and_device feature and the QMAKE_MAC_SDK variable). (*) xcodebuild mode actually still uses exclusive builds, but this is activated locally in uikit/default_post.prf, and uikit/xcodebuild.prf implements the actual build passes manually anyway, so this change does not affect it. Change-Id: Idf173a7bfeb984498d3a49ed6b8d1a16da6c2089 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Change confusing Q_DEAD_CODE_FROM_QT4_FOO defineTor Arne Vestbø2016-10-142-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit c5db8fc74 changed all instances of Q_WS_FOO to have the prefix Q_DEAD_CODE_FROM_QT4 instead, to make it clearer when reading the code that the code in question was a left-over from Qt4, when we used Q_WS_ defines instead of Q_OS_ defines. This worked well for cases of #ifdef Q_DEAD_CODE_FROM_QT4, but less so for cases of #ifndef Q_DEAD_CODE_FROM_QT4, where the code was actually unconditionally included. To make this even clearer, the defines have been replaced by checks for 1 or 0, with a comment describing how the code used to look in Qt4. The use of constants in the check also makes it easier for editors to parse the condition and show visually that the code is defined out. Change-Id: I152070d87334df7259b417cd5e17d7b7950379b7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-113-5/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpixmap.cpp src/widgets/kernel/qformlayout.cpp Change-Id: I8a8391a202adf7f18464a22ddf0a6c4974eab692
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-083-5/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qhttpnetworkconnection.cpp src/network/access/qhttpnetworkconnection_p.h Change-Id: I11f8641ef482efa8cee1b79977d19cc3182814b4
| | * Handle short reads in the local sockets exampleSérgio Martins2016-10-063-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protection against short reads was already half implemented, blockSize was being sent by the server but never used by the client. Also, blockSize was bumped to quint32: If you're in a position where short reads can happen then quint16 is probably not enough to hold the size of your data. On Linux I could only reproduce short reads for messages > 500K. Change-Id: I191a3d781da1d8a119debbdafae641c8340a1da2 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | | fix build of examples subdir with -no-guiOswald Buddenhagen2016-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | the opengl feature is defined in the gui module. Change-Id: Ibf63395729540092ca82ee4ffc4e2ff4971c2a29 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Modernize rasterwindow/openglwindow examples to use requestUpdate()Tor Arne Vestbø2016-09-226-30/+16
| | | | | | | | | | | | | | | Change-Id: Ib8d0c42db7343247d0431ea008eb17da9ee98f4d Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-211-3/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5971b88e is not needed in new configure. This merge also reverts "fix QMAKE_DEFAULT_*DIRS resolution with apple SDK", 2c9d15d7, because it breaks iOS build with new configure system. Conflicts: mkspecs/features/default_pre.prf mkspecs/features/mac/toolchain.prf mkspecs/features/toolchain.prf src/dbus/qdbusconnection.cpp src/plugins/sqldrivers/mysql/qsql_mysql.cpp src/sql/drivers/mysql/qsql_mysql.cpp src/widgets/widgets/qmenubar.cpp src/widgets/widgets/qmenubar_p.h tools/configure/configureapp.cpp tools/configure/environment.cpp tools/configure/environment.h Change-Id: I995533dd334211ebd25912db05b639d6f908aaec
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-161-3/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp Change-Id: I0af32ee55936d523cbd259b6fe82eb9c409f9074
| | * Fix compilation of findfiles examples with QT_NO_CLIPBOARDFriedemann Kleint2016-09-051-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Amends change d1a30be5abcc2d5e5340866434b2691275a135a6. Task-number: QTBUG-55661 Change-Id: Ib7b1b4afd71b3c35493c15c8bf3e2570e321c986 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | Convert the old feature systemLars Knoll2016-09-152-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to the new qmake based configuration system. This removes the old qfeatures.txt (distributed over configure.json files) and qfeatures.h (distributed over qconfig-<module>.h files). qfeatures.prf is gone without replacement, as attempts to use it would lead to followup errors anyway. Change-Id: I1598de19db937082283a905b9592d3849d2199d0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>