Remove QtWidgets dependencies from QtMacExtras.
authorMorten Johan Sørvig <morten.sorvig@digia.com>
Wed, 18 Sep 2013 10:07:45 +0000 (12:07 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 26 Sep 2013 08:24:54 +0000 (10:24 +0200)
commit24d45304aa363c9a08f7157d549cb37c07212108
treef50b6e671f19d663dcd5ce4b18a57479a760b2d8
parent1ef71fcdb15ac0b93751142629b4a2d1ab1e73c8
Remove QtWidgets dependencies from QtMacExtras.

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>
42 files changed:
examples/embeddedqwindow/main.mm
examples/examples.pro
examples/macfunctions/main.cpp
examples/macpasteboardmime/macpasteboardmime.pro
examples/macunifiedtoolbar/macunifiedtoolbar.pro [deleted file]
examples/macunifiedtoolbar/macunifiedtoolbar.qrc [deleted file]
examples/macunifiedtoolbar/main.cpp [deleted file]
examples/macunifiedtoolbar/preferenceswindow.cpp [deleted file]
examples/macunifiedtoolbar/preferenceswindow.h [deleted file]
examples/macunifiedtoolbar/preferenceswindow.ui [deleted file]
examples/macunifiedtoolbar/qtlogo.icns [deleted file]
examples/macunifiedtoolbar/qtlogo.png [deleted file]
examples/macunifiedtoolbar/window.cpp [deleted file]
examples/macunifiedtoolbar/window.h [deleted file]
examples/macunifiedtoolbar/window.ui [deleted file]
examples/qmaccocoaviewcontainer/main.mm [deleted file]
examples/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro [deleted file]
examples/qmacnativewidget/main.mm [deleted file]
examples/qmacnativewidget/qmacnativewidget.pro [deleted file]
src/macextras/macextras-lib.pri
src/macextras/macextras.pro
src/macextras/qmaccocoaviewcontainer.h [deleted file]
src/macextras/qmaccocoaviewcontainer.mm [deleted file]
src/macextras/qmacextrasglobal.h
src/macextras/qmacfunctions.h
src/macextras/qmacfunctions.mm
src/macextras/qmacfunctions_ios.mm
src/macextras/qmacfunctions_mac.mm
src/macextras/qmacfunctions_p.h
src/macextras/qmacnativetoolbar.h [deleted file]
src/macextras/qmacnativetoolbar.mm
src/macextras/qmacnativetoolbar_p.h [new file with mode: 0644]
src/macextras/qmacnativewidget.h [deleted file]
src/macextras/qmacnativewidget.mm [deleted file]
src/macextras/qmacpasteboardmime.mm
src/macextras/qmactoolbardelegate.mm
src/macextras/qmactoolbardelegate_p.h
src/macextras/qmactoolbutton.h [deleted file]
src/macextras/qmactoolbutton.mm
src/macextras/qmactoolbutton_p.h [new file with mode: 0644]
tests/auto/auto.pro
tests/auto/macfunctions/tst_qmacfunctions.mm