diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2015-08-01 08:04:38 -0300 |
|---|---|---|
| committer | Rafael Roquetto <rafael.roquetto@kdab.com> | 2015-08-11 16:23:23 +0000 |
| commit | b907dcaefe88a874488e2ad5e1c99c58873add2d (patch) | |
| tree | 59844c1a0b66342b05ef11042a573bc81df18d35 /examples/widgets/mainwindows | |
| parent | fc410c13980378223fa501b60cc47d08d5b3d8f5 (diff) | |
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 <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'examples/widgets/mainwindows')
| -rw-r--r-- | examples/widgets/mainwindows/application/mainwindow.cpp | 5 | ||||
| -rw-r--r-- | examples/widgets/mainwindows/sdi/mainwindow.cpp | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/examples/widgets/mainwindows/application/mainwindow.cpp b/examples/widgets/mainwindows/application/mainwindow.cpp index 7a93a0cd22..86dfae166f 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 29618f9ac2..f59172f172 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() |