aboutsummaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Fix outdated BSD license headerKai Koehne2017-09-295-5/+55
| | | | | Change-Id: If7364382dd0accd892390f8021c7c8dcf9a6cad0 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix outdated FDL license headerKai Koehne2017-09-293-9/+9
| | | | | Change-Id: I54e89aa0e638f82693d65c5afc1e89966590079b Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Enable make docs target on non macOSv5.9.0-beta4Simo Fält2017-04-241-1/+1
| | | | | | | | | All docs for binary installers are created with Linux so we need to enable doc build on other platforms than macOS. Task-number: QTBUG-59113 Change-Id: I81ddc3817cebff1d86121cadc40c3100c115177e Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix platform conditions across entire modulev5.9.0-alpha1Jake Petroules2017-02-092-3/+3
| | | | | Change-Id: Id63420244eecd5935b7fa7c82b6ad9e0e48ad0f1 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-263-10/+10
|\ | | | | | | Change-Id: Ica8ae5b03d57d4bf043644e8818523e68c959c57
| * Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1Liang Qi2016-09-173-10/+10
| |\ | | | | | | | | | Change-Id: I127063e9dd558bcb8d46ea08fe1e4ae10af3f891
| | * Doc: Change instances of 'OS X' to 'macOS'v5.6.2Topi Reinio2016-08-123-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the Mac platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase), except in link targets (QDoc doesn't expand macros in those). Add a 'macOS' prefix to example titles to make it clear they are specific to that platform. Change-Id: I6bac8d92ca080adf7138a12e0f792c132e382f5d Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Eradicate Q_FOREACH loops and mark the module as Q_FOREACH-freev5.8.0-beta1Marc Mutz2016-09-061-5/+1
|/ / | | | | | | | | | | | | In the examples, replaced a Q_FOREACH with QList<QByteArray>::join(). Change-Id: I6b1ca1666bf0a69c6489f970da19b3f966327cdb Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-194-2/+11
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2330fade4f257fc58a9906e98fc17da889ce62ea
| * add example installsOswald Buddenhagen2016-04-284-2/+11
| | | | | | | | | | Change-Id: I50c0ad9c627129d8c4f988ba33722eb9a3d343be Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Updated license headersAntti Kokko2016-01-205-82/+167
|/ | | | | | | | | | From Qt 5.7 -> examples are lisenced under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header instead of LGPL21 one (in those files which will be under BSD) Change-Id: I206014234be7a9e9b40a8e026d612ed9348635e5 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Examples: fix a function name conflict with QtWidgetLiang Qi2015-06-101-2/+2
| | | | | | Task-number: QTBUG-43213 Change-Id: Ieb1482dd619c7df64cc56b34abdf1e0518c9df14 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Update copyright headersJani Heikkinen2015-02-1613-88/+80
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Ic70e215d0e32bb8bd5a17a2619854e7987aa6f57 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Doc: Fixed broken links caused by "OS X" rename in qtdoc repo.Jerome Pasion2014-09-013-5/+5
| | | | | | | | | -article was renamed to use "OS X" from "Mac OS X". Task-number: QTBUG-40759 Change-Id: I7eb9549883f6ba3be46120e4759e603752a3eb30 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Update license headers and add new licensesJani Heikkinen2014-08-244-76/+44
| | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I7ad600e0dbf455da7381f991ed09acafd63b89b2 Reviewed-by: Antti Kokko <antti.kokko@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* Doc: Improved example documentation.v5.3.0-rc1v5.3.0Jerome Pasion2014-04-163-3/+15
| | | | | | | | | | | | -updated copyright year -added instruction for running the example from within Qt Creator (using \include) -added links to relevant pages -qdocconf change needed for \include Task-number: QTBUG-33597 Change-Id: I19ab712d0e74503d618c49633951d1628f822668 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* Rewrite the Mac native toolbar classes.Morten Johan Sørvig2014-02-109-1/+349
| | | | | | | | | | | | | | | | | | | | | | Rename the classes to QMacToolBar and QMacToolBarItem. (Keep the Qt-style ToolBar name capitalization.) API-review and document a core set of the API, remove the rest. Missing functionality can be added back later on. Add a simple QWindow-based mactoolbar example that shows the core toolbar functionality. Add manual test for more comprehensive testing. Make the QToolbarItem properties actually work, you can now change the text and icon after the toolbar has been displayed. Update license headers. Change-Id: I99fb207df7f1b3cf0d5df178aa863c77cd372a1f Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Doc: Add example documentationv5.2.0-rc1v5.2.0Topi Reinio2013-11-213-0/+113
| | | | | | | | | | Adds minimal documentation for examples and ensures that Mac Extras examples are shown in Qt Creator's example list. Task-number: QTBUG-33682 Change-Id: I6ba88bc7a1b22788d19d66d7d79dd486cd5add8c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* examples: make macfunctions build againLiang Qi2013-11-051-2/+2
| | | | | | | Task-number: QTBUG-34031 Change-Id: I959596206c8090f2bc38bba05a27678471c07480 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Doc: Create documentation structure for Qt Mac Extrasv5.2.0-alpha1Topi Reinio2013-09-2612-4/+6
| | | | | | | | | | | | | | | | | | | Create documentation structure for the module - Module qdocconf - Documentation pages for module index, namespace/classes, examples (not much content yet) Other doc-related changes - Enable running 'make docs' on all platforms - Move examples under examples/macextras for a clean installing to QT_INSTALL_EXAMPLES - Ensure documented classes use correct \inmodule and \since commands - Add \namespace QtMac - Other minor fixes Change-Id: I1376d68fcd7ab324a5d3355f1d15914092900e5b Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Remove QtWidgets dependencies from QtMacExtras.Morten Johan Sørvig2013-09-2619-1049/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to use QtMacExtras from other modules without adding a QtWidgets dependency. It also makes it possible to use QtMacExtras from QtWidgets. Widget-related classes and functions will be added to QtWidgets. Specifics: Make QMacNativeToolBar private, for use by QMainWindow:: setUnifiedTitleAndToolBarOnMac(). Remove the QAction based APIs. Remove the example. We can make QMacNativeToolBar public again when the API is ready and documented. Remove misc functions: toNSMenu, setDockMenu, isMainWindow. Make toCfSTring/Url private pending inclusion into QtCore. Change-Id: Ic55e78d8ef923149c23884f6589732f7dfb94153 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Rename the QtMacExtras namespace to QtMacJ-P Nurmi2013-09-132-5/+5
| | | | | | | | | Change-Id: If6a01685a9fc5ff59dd02dbeeef7e8682cefae39 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* Support namespaced buildLiang Qi2013-07-014-11/+2
| | | | | | Change-Id: Ie2073c629dcca6e8bdf33b803c9015b0373fc3a5 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* setEmbeddedInForeignView to embed a QWindow in a foreign windowShawn Rutledge2013-04-262-7/+11
| | | | | | | Depends on https://codereview.qt-project.org/#change,54607 in qtbase Change-Id: Id95038b0a6f3383358a4d688ee2c5e6907ebe7c0 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Introduce QtMacExtras::setDockMenu.Jake Petroules2013-04-151-1/+1
| | | | | | | qt_mac_set_dock_menu is now just a compatibility synonym. Change-Id: I16b9b04004a6821ae38180b7f3ec1b96fcd0115c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Remove the now-unnecessary "Mac" infixes from namespaced functions.Jake Petroules2013-04-151-2/+2
| | | | | Change-Id: I9dc0730a837ed091de6285f1b6f8b014f762a921 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Rename QMacUnifiedToolBar -> QMacNativeToolBar.Jake Petroules2013-04-152-4/+4
| | | | | | | | | | | All NSToolbars are drawn in unified style since OS X 10.5 and this cannot be changed. Plus, the unified style is a window mask, which has more to do with NSWindow than NSToolbar. In light of this, using the term "native" makes more sense. Change-Id: I6f1fb4c0dc853290c68aab30092bcf5136493883 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Rename and namespace setUnifiedTitleAndToolBarOnMac.Jake Petroules2013-04-151-5/+3
| | | | | Change-Id: I30babc76d5b35f7834752d88b40c7f8af8ba6a2d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* QtMacExtras: Disabling examples from other than mac buildsSimo Fält2013-04-111-2/+3
| | | | | | | | | Disabled examples from being built on platforms where it doesn't make sense. Change-Id: Ifff2e404233d26983b72f2f47a141b9f26f8e232 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Compile.Morten Johan Sørvig2013-04-111-1/+1
| | | | | | Change-Id: I35c9bafc2413f0db440f615c11efec132ffb14dd Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Rename example files qtmac -> qmac.Morten Johan Sørvig2013-04-115-2/+2
| | | | | | | Change-Id: I5458ea3a65e4a3d6f404c6fde94db492374dbe76 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Rename files: qtfoo -> qfooMorten Johan Sørvig2013-04-114-4/+4
| | | | | Change-Id: I9951164716550fe6a656af32c79be3e9812625bf Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Rename QtMacCococaViewContainer.Morten Johan Sørvig2013-04-111-2/+2
| | | | | | | | To QMacCococaViewContainer. Change-Id: I48cd6a11aaddba3db128c3ae845812a3b5bd5556 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Rename QtMacUnifiedToolBar.Morten Johan Sørvig2013-04-103-11/+11
| | | | | | | | | QtMacUnifiedToolBar -> QMacUnifiedToolBar QtMacToolButton -> QMacToolButton Change-Id: I5d5bf0810b862624ca1920a969cf9a64559b645d Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Rename QtMacNativeWidget -> QMacNativeWidgetMorten Johan Sørvig2013-04-101-1/+1
| | | | | | Change-Id: I844656e3bebf311ba11dab0f5b37577a60dff319 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Rename qtmacfunctions -> qmacfunctionsMorten Johan Sørvig2013-04-101-1/+1
| | | | | | | | Header and implementation file. Change-Id: Idb22c04a0bb9c96141c283052bb81c09f9242ab9 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Rename Qt namespace to QtMacExtrasMorten Johan Sørvig2013-04-101-2/+2
| | | | | | | | | In-line with the common naming pattern for the platform "extras". Change-Id: I0335b62ebec090ecf3a387333ade13486b260299 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Add QtMacCocoaViewContainer.Morten Johan Sørvig2013-04-083-1/+75
| | | | | | | | | | | | | QtMacCocoaViewContainer supports embedding a native NSView in a QWidget hierarchy. The embedding itself is implemented in the Cocoa platform plugin in the QPlatformWindow layer, and is accessed via the "setcontentview" platform function. Change-Id: I43a189952ce31da4e39da6442a4a19ad15e497a3 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Compile.Morten Johan Sørvig2013-04-081-2/+2
| | | | | Change-Id: Id14217ee1ad96499c58f16508860601978312283 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Structure like a proper Qt module.Jake Petroules2013-04-035-11/+5
| | | | | Change-Id: Ie69303983187826637ae8a12a8478bd044cdaf0d Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix the license headersLaszlo Papp2013-03-137-236/+239
| | | | | | | | | QT_MODULE_TO_TEST=qtmacextras qtqa/tests/prebuild/license/tst_licenses.pl -> returns no error anymore. Change-Id: I5694b2075cde9a72cc30ad60948266f447e973fc Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Jason McDonald <macadder1@gmail.com>
* Fix QtMacNativeWidget build with Qt 4.x and 5.0.Jake Petroules2013-02-251-1/+8
| | | | | Change-Id: I66b3676251c32c4959828ba637d40e8b2aa62598 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix QtMacFunctions example build with Qt 4.x and 5.0.Jake Petroules2013-02-251-1/+4
| | | | | Change-Id: I66f93e03fa918256895a5148e85088f54feb41c5 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix QMacPasteboardMime build with Qt 4.x and Qt 5.0.Jake Petroules2013-01-311-2/+5
| | | | | Change-Id: Icc79fc97ce1640f7dd3da7e5e964d893aad159b0 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Add examples.proMorten Johan Sørvig2013-01-314-4/+8
| | | | | | | + misc cleanups. Change-Id: If0cae675156199db6f04dcdabe91abd9dac541ad Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Add to/fromMacCGImageRef example.Morten Johan Sørvig2013-01-314-0/+14
| | | | | Change-Id: I608d5dab794972c809dcb0c31d97411ebd36f35e Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Add QtMacNativeWidget example.Morten Johan Sørvig2013-01-312-0/+140
| | | | | | | | Needs implementation support in the Qt Cocoa platform plugin. Change-Id: Ie8c37889758ada7d3503b1abf4432f0722b13735 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Add Qt::SubView example.Morten Johan Sørvig2013-01-314-0/+406
| | | | | Change-Id: I9718de6db6672b539f0d5dd36c94dbbdd4604ed7 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Add qt_mac_set_dock_menu(QMenu *)Morten Johan Sørvig2013-01-312-0/+66
| | | | | Change-Id: I75c6c20e0c9e94ff1ddc336083953a9a2f472fe5 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Add QMacPasteboardMime.Morten Johan Sørvig2013-01-232-0/+158
| | | | | | | | | | | | | | | | Equivalent to QMacPasteboardMime from Qt 4. Requires exported functions from QPlatformNativeInterface. The API from Qt 4 is in large parts kept, with the exception of the static functions used internally by Qt (?) The implementation is based on having two equal classes and keeping them in sync: One internal to the Cocoa platform plugin and one public in QtMacExtras. Change-Id: I334fc982355fbb6315d7a44eeca8551071ba60be Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 15:57:40 +0000