diff options
Diffstat (limited to 'examples/widgets')
9 files changed, 20 insertions, 4 deletions
diff --git a/examples/widgets/mac/qmaccocoaviewcontainer/main.mm b/examples/widgets/mac/qmaccocoaviewcontainer/main.mm index 870ab65ff7..8ef8a50254 100644 --- a/examples/widgets/mac/qmaccocoaviewcontainer/main.mm +++ b/examples/widgets/mac/qmaccocoaviewcontainer/main.mm @@ -31,7 +31,7 @@ ** ****************************************************************************/ -#include <Cocoa/Cocoa.h> +#include <AppKit/AppKit.h> #include <QtWidgets> #include <QMacCocoaViewContainer> diff --git a/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro b/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro index c8c2195cb8..9dea65bf9f 100644 --- a/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro +++ b/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro @@ -1,7 +1,7 @@ TEMPLATE = app OBJECTIVE_SOURCES += main.mm -LIBS += -framework Cocoa +LIBS += -framework AppKit QT += widgets diff --git a/examples/widgets/mac/qmacnativewidget/main.mm b/examples/widgets/mac/qmacnativewidget/main.mm index b01db8051b..436be55675 100644 --- a/examples/widgets/mac/qmacnativewidget/main.mm +++ b/examples/widgets/mac/qmacnativewidget/main.mm @@ -31,7 +31,7 @@ ** ****************************************************************************/ -#import <Cocoa/Cocoa.h> +#import <AppKit/AppKit.h> #include <QApplication> #include <QDebug> diff --git a/examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro b/examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro index cafff9f035..9da91c7be0 100644 --- a/examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro +++ b/examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro @@ -1,7 +1,7 @@ TEMPLATE = app OBJECTIVE_SOURCES += main.mm -LIBS += -framework Cocoa +LIBS += -framework AppKit QT += widgets #QT += widgets-private gui-private core-private diff --git a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp index d746bbe8d3..cd0543ecd9 100644 --- a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp +++ b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp @@ -468,11 +468,13 @@ void ColorSwatch::tabInto(QAction *action) mainWindow->tabifyDockWidget(target, this); } +#ifndef QT_NO_CONTEXTMENU void ColorSwatch::contextMenuEvent(QContextMenuEvent *event) { event->accept(); menu->exec(event->globalPos()); } +#endif // QT_NO_CONTEXTMENU void ColorSwatch::resizeEvent(QResizeEvent *e) { diff --git a/examples/widgets/mainwindows/mainwindow/colorswatch.h b/examples/widgets/mainwindows/mainwindow/colorswatch.h index 8827a7dca7..251807d60f 100644 --- a/examples/widgets/mainwindows/mainwindow/colorswatch.h +++ b/examples/widgets/mainwindows/mainwindow/colorswatch.h @@ -51,7 +51,9 @@ public: QMenu *colorSwatchMenu() const { return menu; } protected: +#ifndef QT_NO_CONTEXTMENU void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; +#endif // QT_NO_CONTEXTMENU void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; private slots: diff --git a/examples/widgets/mainwindows/menus/mainwindow.cpp b/examples/widgets/mainwindows/menus/mainwindow.cpp index d487e3a277..fb06bc8ad0 100644 --- a/examples/widgets/mainwindows/menus/mainwindow.cpp +++ b/examples/widgets/mainwindows/menus/mainwindow.cpp @@ -83,6 +83,7 @@ MainWindow::MainWindow() //! [2] //! [3] +#ifndef QT_NO_CONTEXTMENU void MainWindow::contextMenuEvent(QContextMenuEvent *event) { QMenu menu(this); @@ -91,6 +92,7 @@ void MainWindow::contextMenuEvent(QContextMenuEvent *event) menu.addAction(pasteAct); menu.exec(event->globalPos()); } +#endif // QT_NO_CONTEXTMENU //! [3] void MainWindow::newFile() diff --git a/examples/widgets/mainwindows/menus/mainwindow.h b/examples/widgets/mainwindows/menus/mainwindow.h index 9710580819..57dd036767 100644 --- a/examples/widgets/mainwindows/menus/mainwindow.h +++ b/examples/widgets/mainwindows/menus/mainwindow.h @@ -59,7 +59,9 @@ public: MainWindow(); protected: +#ifndef QT_NO_CONTEXTMENU void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; +#endif // QT_NO_CONTEXTMENU //! [0] //! [1] diff --git a/examples/widgets/tools/tools.pro b/examples/widgets/tools/tools.pro index 282f8dedea..503efa8403 100644 --- a/examples/widgets/tools/tools.pro +++ b/examples/widgets/tools/tools.pro @@ -18,3 +18,11 @@ SUBDIRS = \ contains(DEFINES, QT_NO_TRANSLATION): SUBDIRS -= i18n plugandpaint.depends = plugandpaintplugins + +load(qfeatures) +contains(QT_DISABLED_FEATURES, library) { + SUBDIRS -= \ + echoplugin \ + plugandpaintplugins \ + plugandpaint +} |