3 files changed, 18 insertions, 7 deletions
diff --git a/examples/widgets/desktop/systray/window.cpp b/examples/widgets/desktop/systray/window.cpp
index 5e98996ff3..05944c92a7 100644
--- a/examples/widgets/desktop/systray/window.cpp
+++ b/examples/widgets/desktop/systray/window.cpp
@@ -160,10 +160,16 @@ void Window::iconActivated(QSystemTrayIcon::ActivationReason reason)
 void Window::showMessage()
 {
     showIconCheckBox->setChecked(true);
-    QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::MessageIcon(
+    QSystemTrayIcon::MessageIcon msgIcon = QSystemTrayIcon::MessageIcon(
             typeComboBox->itemData(typeComboBox->currentIndex()).toInt());
-    trayIcon->showMessage(titleEdit->text(), bodyEdit->toPlainText(), icon,
+    if (msgIcon == QSystemTrayIcon::NoIcon) {
+        QIcon icon(iconComboBox->itemIcon(iconComboBox->currentIndex()));
+        trayIcon->showMessage(titleEdit->text(), bodyEdit->toPlainText(), icon,
                           durationSpinBox->value() * 1000);
+    } else {
+        trayIcon->showMessage(titleEdit->text(), bodyEdit->toPlainText(), msgIcon,
+                          durationSpinBox->value() * 1000);
+    }
 }
 //! [5]
 
@@ -215,6 +221,8 @@ void Window::createMessageGroupBox()
     typeComboBox->addItem(style()->standardIcon(
             QStyle::SP_MessageBoxCritical), tr("Critical"),
             QSystemTrayIcon::Critical);
+    typeComboBox->addItem(QIcon(), tr("Custom icon"),
+            QSystemTrayIcon::NoIcon);
     typeComboBox->setCurrentIndex(1);
 
     durationLabel = new QLabel(tr("Duration:"));
diff --git a/examples/widgets/painting/fontsampler/mainwindow.cpp b/examples/widgets/painting/fontsampler/mainwindow.cpp
index 88b23d5cfb..192ffbd369 100644
--- a/examples/widgets/painting/fontsampler/mainwindow.cpp
+++ b/examples/widgets/painting/fontsampler/mainwindow.cpp
@@ -212,9 +212,9 @@ QMap<QString, StyleItems> MainWindow::currentPageMap()
     return pageMap;
 }
 
-#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printdialog)
 void MainWindow::on_printAction_triggered()
 {
+#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printdialog)
     pageMap = currentPageMap();
 
     if (pageMap.count() == 0)
@@ -231,10 +231,12 @@ void MainWindow::on_printAction_triggered()
         printer.setFromTo(1, pageMap.keys().count());
 
     printDocument(&printer);
+#endif
 }
 
 void MainWindow::printDocument(QPrinter *printer)
 {
+#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printdialog)
     printer->setFromTo(1, pageMap.count());
 
     QProgressDialog progress(tr("Preparing font samples..."), tr("&Cancel"),
@@ -263,10 +265,12 @@ void MainWindow::printDocument(QPrinter *printer)
     }
 
     painter.end();
+#endif
 }
 
 void MainWindow::on_printPreviewAction_triggered()
 {
+#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printdialog)
     pageMap = currentPageMap();
 
     if (pageMap.count() == 0)
@@ -277,10 +281,12 @@ void MainWindow::on_printPreviewAction_triggered()
     connect(&preview, SIGNAL(paintRequested(QPrinter*)),
             this, SLOT(printDocument(QPrinter*)));
     preview.exec();
+#endif
 }
 
 void MainWindow::printPage(int index, QPainter *painter, QPrinter *printer)
 {
+#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printdialog)
     QString family = pageMap.keys()[index];
     StyleItems items = pageMap[family];
 
@@ -343,5 +349,5 @@ void MainWindow::printPage(int index, QPainter *painter, QPrinter *printer)
     }
 
     painter->restore();
-}
 #endif
+}
diff --git a/examples/widgets/painting/fontsampler/mainwindow.h b/examples/widgets/painting/fontsampler/mainwindow.h
index 21e76f1a62..8f59e1021b 100644
--- a/examples/widgets/painting/fontsampler/mainwindow.h
+++ b/examples/widgets/painting/fontsampler/mainwindow.h
@@ -78,13 +78,10 @@ public slots:
     void on_clearAction_triggered();
     void on_markAction_triggered();
     void on_unmarkAction_triggered();
-
-#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printdialog)
     void on_printAction_triggered();
     void on_printPreviewAction_triggered();
     void printDocument(QPrinter *printer);
     void printPage(int index, QPainter *painter, QPrinter *printer);
-#endif
     void showFont(QTreeWidgetItem *item);
     void updateStyles(QTreeWidgetItem *item, int column);