diff options
author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-09-18 12:07:45 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 10:24:54 +0200 |
commit | 24d45304aa363c9a08f7157d549cb37c07212108 (patch) | |
tree | f50b6e671f19d663dcd5ce4b18a57479a760b2d8 /src/macextras/macextras-lib.pri | |
parent | 1ef71fcdb15ac0b93751142629b4a2d1ab1e73c8 (diff) |
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>
Diffstat (limited to 'src/macextras/macextras-lib.pri')
-rw-r--r-- | src/macextras/macextras-lib.pri | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/macextras/macextras-lib.pri b/src/macextras/macextras-lib.pri index 245c4c5..8240436 100644 --- a/src/macextras/macextras-lib.pri +++ b/src/macextras/macextras-lib.pri @@ -11,21 +11,15 @@ mac { LIBS *= -framework UIKit } else { - PUBLIC_HEADERS += \ - $$PWD/qmaccocoaviewcontainer.h \ - $$PWD/qmacnativetoolbar.h \ - $$PWD/qmacnativewidget.h \ - $$PWD/qmactoolbutton.h - PRIVATE_HEADERS += \ + $$PWD/qmacnativetoolbar_p.h \ + $$PWD/qmactoolbutton_p.h \ $$PWD/qmactoolbardelegate_p.h \ $$PWD/qnstoolbar_p.h OBJECTIVE_SOURCES += \ - $$PWD/qmaccocoaviewcontainer.mm \ $$PWD/qmacfunctions_mac.mm \ $$PWD/qmacnativetoolbar.mm \ - $$PWD/qmacnativewidget.mm \ $$PWD/qmactoolbardelegate.mm \ $$PWD/qmactoolbutton.mm \ $$PWD/qnstoolbar.mm |