AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile fix if QT_NO_CLIPBOARD defined

Browse Source 
Change-Id: Ie8ecaa2ba8f99d0b531b3a81b5f0005508e677eb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Andreas Holzammer 2012-04-19 15:56:29 +02:00 committed by Qt by Nokia
parent 4acb8bfc59
commit 90292529b9
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples/mainwindows/mdi/mainwindow.cpp
View File

@ -117,6 +117,7 @@ void MainWindow::saveAs()
statusBar()->showMessage(tr("File saved"), 2000);
}
#ifndef QT_NO_CLIPBOARD
void MainWindow::cut()
{
if (activeMdiChild())
@ -134,6 +135,7 @@ void MainWindow::paste()
if (activeMdiChild())
activeMdiChild()->paste();
}
#endif
void MainWindow::about()
{
@ -147,7 +149,9 @@ void MainWindow::updateMenus()
bool hasMdiChild = (activeMdiChild() != 0);
saveAct->setEnabled(hasMdiChild);
saveAsAct->setEnabled(hasMdiChild);
#ifndef QT_NO_CLIPBOARD
pasteAct->setEnabled(hasMdiChild);
#endif
closeAct->setEnabled(hasMdiChild);
closeAllAct->setEnabled(hasMdiChild);
tileAct->setEnabled(hasMdiChild);
@ -156,10 +160,12 @@ void MainWindow::updateMenus()
previousAct->setEnabled(hasMdiChild);
separatorAct->setVisible(hasMdiChild);
#ifndef QT_NO_CLIPBOARD
bool hasSelection = (activeMdiChild() &&
activeMdiChild()->textCursor().hasSelection());
cutAct->setEnabled(hasSelection);
copyAct->setEnabled(hasSelection);
#endif
}
void MainWindow::updateWindowMenu()
@ -202,10 +208,12 @@ MdiChild *MainWindow::createMdiChild()
MdiChild *child = new MdiChild;
mdiArea->addSubWindow(child);
#ifndef QT_NO_CLIPBOARD
connect(child, SIGNAL(copyAvailable(bool)),
cutAct, SLOT(setEnabled(bool)));
connect(child, SIGNAL(copyAvailable(bool)),
copyAct, SLOT(setEnabled(bool)));
#endif
return child;
}
@ -239,6 +247,7 @@ void MainWindow::createActions()
connect(exitAct, SIGNAL(triggered()), qApp, SLOT(closeAllWindows()));
//! [0]
#ifndef QT_NO_CLIPBOARD
cutAct = new QAction(QIcon(":/images/cut.png"), tr("Cu&t"), this);
cutAct->setShortcuts(QKeySequence::Cut);
cutAct->setStatusTip(tr("Cut the current selection's contents to the "
@ -256,6 +265,7 @@ void MainWindow::createActions()
pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current "
"selection"));
connect(pasteAct, SIGNAL(triggered()), this, SLOT(paste()));
#endif
closeAct = new QAction(tr("Cl&ose"), this);
closeAct->setStatusTip(tr("Close the active window"));
@ -313,9 +323,11 @@ void MainWindow::createMenus()
fileMenu->addAction(exitAct);
editMenu = menuBar()->addMenu(tr("&Edit"));
#ifndef QT_NO_CLIPBOARD
editMenu->addAction(cutAct);
editMenu->addAction(copyAct);
editMenu->addAction(pasteAct);
#endif
windowMenu = menuBar()->addMenu(tr("&Window"));
updateWindowMenu();
@ -335,10 +347,12 @@ void MainWindow::createToolBars()
fileToolBar->addAction(openAct);
fileToolBar->addAction(saveAct);
#ifndef QT_NO_CLIPBOARD
editToolBar = addToolBar(tr("Edit"));
editToolBar->addAction(cutAct);
editToolBar->addAction(copyAct);
editToolBar->addAction(pasteAct);
#endif
}
void MainWindow::createStatusBar()

4
examples/mainwindows/mdi/mainwindow.h
View File

@ -67,9 +67,11 @@ private slots:
void open();
void save();
void saveAs();
#ifndef QT_NO_CLIPBOARD
void cut();
void copy();
void paste();
#endif
void about();
void updateMenus();
void updateWindowMenu();
@ -101,9 +103,11 @@ private:
QAction *saveAct;
QAction *saveAsAct;
QAction *exitAct;
#ifndef QT_NO_CLIPBOARD
QAction *cutAct;
QAction *copyAct;
QAction *pasteAct;
#endif
QAction *closeAct;
QAction *closeAllAct;
QAction *tileAct;