aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Add example documentationv5.2.0-rc1v5.2.0Topi Reinio2013-11-214-0/+116
| | | | | | | | | | 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>
* Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-1/+1
| | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I6f00117c1980f5ceb59d71fedbe986f02ddab39b Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@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>
* use private linkage where possibleOswald Buddenhagen2013-11-041-2/+2
| | | | | | | | Change-Id: I01d27f1c493cf8108a9ff6e488e036bea7bfca12 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix buildThierry Bastian2013-10-301-2/+1
| | | | | | | An inline function was declared extern in a mm file. Change-Id: Ie9df92117c5b8f926b236a11cc3f66558d99a47d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Change camel-case header <QMacFunctions> to <QtMac>Sze Howe Koh2013-10-292-2/+2
| | | | | | | | | | Name the header after its namespace, to reduce the number of names developers must remember. Change-Id: I433263d8a0d70993d5929adeb1198f3e05df8b36 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Doc: Setting navigation bar variables in qdocconf file.v5.2.0-beta1Topi Reinio2013-10-021-0/+3
| | | | | | | Used for navigation in offline mode. Change-Id: I7bd9f11c14cd2197bbc3f5039500a04f5aa4747d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Update the git-archive export optionsSergio Ahumada2013-09-302-0/+5
| | | | | | | | | | | | | | The .gitattributes, .gitignore, .commit-template files do not need to be present in packaged sources, as they are for people using the Git repository. People who download tarballs usually don't reimport into Git -- they should just download the actual repositories. Meanwhile, the .tag file is quite useful. Instead of making Git extract to the useless SHA-1 of the "$Id$\n" string, ask git-archive to store the SHA-1 of the commit being packaged. Change-Id: Id6674657a9072d875e13771aadde842e1dfb3b93 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Doc: Create documentation structure for Qt Mac Extrasv5.2.0-alpha1Topi Reinio2013-09-2622-17/+309
| | | | | | | | | | | | | | | | | | | 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>
* Bump qtmacextras version to 5.2.0Sergio Ahumada2013-09-261-1/+1
| | | | | | | Change-Id: I6e1f329b2d4bcf6b54a9db078c5f7064224e8480 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Remove QtWidgets dependencies from QtMacExtras.Morten Johan Sørvig2013-09-2640-1881/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-1310-29/+29
| | | | | | | | | 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>
* Add headersclean test.Jake Petroules2013-09-043-2/+8
| | | | | Change-Id: I7088aeec399082fc32ebc2c215163b552f25ff60 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add CMake test.Stephen Kelly2013-09-045-1/+83
| | | | | | Change-Id: If0b1b999466740661f158ab649462fae51800554 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Privatise private headers and modules.Jake Petroules2013-09-047-7/+8
| | | | | Change-Id: Iaad9cdc897ba19acfdbfc136e4baf959cabc3f70 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Don't use emit in public headers.Stephen Kelly2013-09-041-1/+1
| | | | | | Change-Id: I465ceee790e63cf2d264dc7d81839a153b11bdcf Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Build fix for 10.6Richard Moe Gustavsen2013-08-075-5/+7
| | | | | | | | | Applied patch pointed to from QTBUG-31363 that ensures that we include system headers before Qt/project headers. Task-number: QTBUG-31363 Change-Id: I1aae10c9be0337aab8f84044e2fcfe04e1e75c41 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Support namespaced buildLiang Qi2013-07-0117-52/+80
| | | | | | Change-Id: Ie2073c629dcca6e8bdf33b803c9015b0373fc3a5 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* sync.profile: Point dependencies to an empty stringSergio Ahumada2013-07-011-1/+1
| | | | | | | | | This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. Change-Id: I6bf7bfaf03d8a999ed63167c487225eb7153a55a Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Introduce a macro for forward declaring Objective-C classes.Jake Petroules2013-06-265-28/+23
| | | | | Change-Id: I2334aac6c70861ef18875a4b5ef4116b9eb5592e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Use NSView pointers instead of void pointers.Jake Petroules2013-06-262-2/+2
| | | | | Change-Id: If6bc3fa07068ea1991c1740127bbd463b796cc07 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Remove unneeded #import.Jake Petroules2013-06-261-1/+0
| | | | | Change-Id: I8c225d0f2c74acaf87cdc7d6559cdac3cd7d11fc Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Fix minor spelling error.Jake Petroules2013-06-261-1/+1
| | | | | Change-Id: Ibcde4444cef08fd7510f4d0ccc3bf60c16731d77 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-06-232-8/+0
| | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: I3202f286c119b5cb2affd0f6ef3b1ae2135b0152 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fixed incorrect usage of `signals' in headersSergio Ahumada2013-06-222-2/+2
| | | | | | | | Qt headers must use Q_SIGNALS. Change-Id: Ie110a0b236c4ccc0cc317ccb90cf60fe1a78280b Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Add a function to determine whether a Qt window is main.Jake Petroules2013-05-222-0/+35
| | | | | | | | | | | | | Unlike other operating systems, OS X has two distinct concepts for window activation that affect behavior and drawing - key and main. The key window is what Qt calls "active". The differences between key and main windows are documented here: https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/WinPanel/Concepts/ChangingMainKeyWindow.html Change-Id: I2071f163e4774bbbcddbac24078086caa4466443 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* setEmbeddedInForeignView to embed a QWindow in a foreign windowShawn Rutledge2013-04-263-15/+20
| | | | | | | Depends on https://codereview.qt-project.org/#change,54607 in qtbase Change-Id: Id95038b0a6f3383358a4d688ee2c5e6907ebe7c0 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Rename QtMacFunctions -> QMacFunctions.Jake Petroules2013-04-241-1/+1
| | | | | | | This one was missed in the initial batch of renamings. Change-Id: I706116c21f4fc76f0e417185d87d627d15271926 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Add a method for getting the current CGContext on both Darwin OSes.Jake Petroules2013-04-164-1/+72
| | | | | Change-Id: I391f7ecaee0b57e5bb61bca1d0c966675af115e4 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Add type converters for QUrl/NSURL and QByteArray/NSData.Jake Petroules2013-04-152-0/+37
| | | | | Change-Id: Idbfaa54faa790c29b206c788159709830d846cb3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Modularize QtMacFunctions a bit by splitting it into several files.Jake Petroules2013-04-155-83/+192
| | | | | | | | | | qmacfunctions.mm contains implementations of functions for OS X and iOS. qmacfunctions_mac.mm contains OS X only implementations. qmacfunctions_ios.mm would contain iOS only implementations. qmacfunctions_p.h contains shared helpers for the above three files. Change-Id: I3222c2276c1de33e3086fdcc0b27eeab57e94175 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Introduce QtMacExtras::setDockMenu.Jake Petroules2013-04-153-18/+21
| | | | | | | qt_mac_set_dock_menu is now just a compatibility synonym. Change-Id: I16b9b04004a6821ae38180b7f3ec1b96fcd0115c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix spelling error.Jake Petroules2013-04-151-2/+2
| | | | | Change-Id: Ie5d49eee14b65ee982adbbc8f111f2055673c7f1 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Remove the now-unnecessary "Mac" infixes from namespaced functions.Jake Petroules2013-04-154-15/+14
| | | | | Change-Id: I9dc0730a837ed091de6285f1b6f8b014f762a921 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Rename QMacUnifiedToolBar -> QMacNativeToolBar.Jake Petroules2013-04-155-73/+73
| | | | | | | | | | | 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>
* Add a method that provides access to the native NSToolbar object.Jake Petroules2013-04-152-0/+13
| | | | | Change-Id: I45b60c2dec8ad73c5a6fff5f86275b2720e213f6 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Always create a native toolbar if the given QToolBar is not null.Jake Petroules2013-04-151-9/+5
| | | | | | | | | | | Previously, if the user tried to create a native toolbar but set on = false we tried to be conservative and not create the NSToolbar just yet (fairly non-obvious). The user might not want to have the toolbar displayed immediately but still obtain the pointer for later use, so we'll support this use case by always returning a toolbar. Change-Id: I94dcd3ae57f0462893b2539623423f2a2d85437a Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Rename and namespace setUnifiedTitleAndToolBarOnMac.Jake Petroules2013-04-155-90/+34
| | | | | Change-Id: I30babc76d5b35f7834752d88b40c7f8af8ba6a2d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Rename QtMacToolbarDelegate / QtNSToolbarNotifierMorten Johan Sørvig2013-04-113-9/+9
| | | | | | Change-Id: Ia81bee1255388969df395ca92f040bd6fd8da35d Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Final QMacPasteboardMime renaming.Morten Johan Sørvig2013-04-111-2/+2
| | | | | | Change-Id: Ifabab8a9b722b6111a020421144e3647e7ee015b Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Add overload to toNSMenu() to get NSMenu handle from QMenuBar object.Dmytro Tyshchenko2013-04-113-2/+27
| | | | | | | | Task-number: QTBUG-28869 Change-Id: I33e7a875a8f1aa8d6db7efbd95b662b4b6c182ce Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@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-1119-45/+45
| | | | | Change-Id: I9951164716550fe6a656af32c79be3e9812625bf Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Rename QtMacCococaViewContainer.Morten Johan Sørvig2013-04-113-29/+29
| | | | | | | | To QMacCococaViewContainer. Change-Id: I48cd6a11aaddba3db128c3ae845812a3b5bd5556 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Rename QtMacFunctions -> QMacFunctionsMorten Johan Sørvig2013-04-103-95/+10
| | | | | | Change-Id: I4162083cb7f75361a3fc50f2eff9a2a31ad249fb Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Place toNSMenu in QtMacExtras namespaceMorten Johan Sørvig2013-04-102-1/+86
| | | | | | Change-Id: I72393f6ea393c6a808c3c5ba20836cc422a708e9 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Rename QtMacUnifiedToolBar.Morten Johan Sørvig2013-04-1010-140/+140
| | | | | | | | | 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-103-17/+17
| | | | | | Change-Id: I844656e3bebf311ba11dab0f5b37577a60dff319 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 07:15:59 +0000