From b907dcaefe88a874488e2ad5e1c99c58873add2d Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Sat, 1 Aug 2015 08:04:38 -0300 Subject: [PATCH] Fix mainwindow examples when clipboard support is disabled. Some platforms, such as QNX, do not implement QT_CLIPBOARD. Change-Id: I3a8b484b4c00c28a91d3727054672c3788f98381 Reviewed-by: Friedemann Kleint --- examples/widgets/mainwindows/application/mainwindow.cpp | 5 +++++ examples/widgets/mainwindows/sdi/mainwindow.cpp | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/examples/widgets/mainwindows/application/mainwindow.cpp b/examples/widgets/mainwindows/application/mainwindow.cpp index 7a93a0cd22c..86dfae166f3 100644 --- a/examples/widgets/mainwindows/application/mainwindow.cpp +++ b/examples/widgets/mainwindows/application/mainwindow.cpp @@ -196,6 +196,7 @@ void MainWindow::createActions() QMenu *editMenu = menuBar()->addMenu(tr("&Edit")); QToolBar *editToolBar = addToolBar(tr("Edit")); //! +#ifndef QT_NO_CLIPBOARD const QIcon cutIcon = QIcon::fromTheme("edit-cut", QIcon(":/images/cut.png")); QAction *cutAct = new QAction(cutIcon, tr("Cu&t"), this); //! [21] @@ -226,6 +227,8 @@ void MainWindow::createActions() menuBar()->addSeparator(); +#endif // !QT_NO_CLIPBOARD + QMenu *helpMenu = menuBar()->addMenu(tr("&Help")); QAction *aboutAct = helpMenu->addAction(tr("&About"), this, &MainWindow::about); aboutAct->setStatusTip(tr("Show the application's About box")); @@ -237,11 +240,13 @@ void MainWindow::createActions() //! [22] //! [23] +#ifndef QT_NO_CLIPBOARD cutAct->setEnabled(false); //! [23] //! [24] copyAct->setEnabled(false); connect(textEdit, &QPlainTextEdit::copyAvailable, cutAct, &QAction::setEnabled); connect(textEdit, &QPlainTextEdit::copyAvailable, copyAct, &QAction::setEnabled); +#endif // !QT_NO_CLIPBOARD } //! [24] diff --git a/examples/widgets/mainwindows/sdi/mainwindow.cpp b/examples/widgets/mainwindows/sdi/mainwindow.cpp index 29618f9ac2f..f59172f1724 100644 --- a/examples/widgets/mainwindows/sdi/mainwindow.cpp +++ b/examples/widgets/mainwindows/sdi/mainwindow.cpp @@ -224,6 +224,7 @@ void MainWindow::createActions() QMenu *editMenu = menuBar()->addMenu(tr("&Edit")); QToolBar *editToolBar = addToolBar(tr("Edit")); +#ifndef QT_NO_CLIPBOARD const QIcon cutIcon = QIcon::fromTheme("edit-cut", QIcon(":/images/cut.png")); QAction *cutAct = new QAction(cutIcon, tr("Cu&t"), this); cutAct->setShortcuts(QKeySequence::Cut); @@ -252,6 +253,7 @@ void MainWindow::createActions() editToolBar->addAction(pasteAct); menuBar()->addSeparator(); +#endif // !QT_NO_CLIPBOARD QMenu *helpMenu = menuBar()->addMenu(tr("&Help")); QAction *aboutAct = helpMenu->addAction(tr("&About"), this, &MainWindow::about); @@ -260,10 +262,12 @@ void MainWindow::createActions() QAction *aboutQtAct = helpMenu->addAction(tr("About &Qt"), qApp, &QApplication::aboutQt); aboutQtAct->setStatusTip(tr("Show the Qt library's About box")); +#ifndef QT_NO_CLIPBOARD cutAct->setEnabled(false); copyAct->setEnabled(false); connect(textEdit, &QTextEdit::copyAvailable, cutAct, &QAction::setEnabled); connect(textEdit, &QTextEdit::copyAvailable, copyAct, &QAction::setEnabled); +#endif // !QT_NO_CLIPBOARD } void MainWindow::createStatusBar()