Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	mkspecs/qnx-armv7le-qcc/qplatformdefs.h
	src/printsupport/kernel/qcups.cpp
	src/widgets/styles/qstyle.h
	tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp

Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267

4 files changed, 25 insertions, 0 deletions

diff --git a/tests/manual/dialogs/main.cpp b/tests/manual/dialogs/main.cpp
index 6082727c3b..b2b5007662 100644
--- a/tests/manual/dialogs/main.cpp
+++ b/tests/manual/dialogs/main.cpp
@@ -70,6 +70,15 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     QAction *quitAction = fileMenu->addAction(tr("Quit"));
     quitAction->setShortcut(QKeySequence(QKeySequence::Quit));
     connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+    QMenu *editMenu = menuBar()->addMenu(tr("&Edit"));
+    QAction *action = editMenu->addAction(tr("Cut"));
+    action->setShortcut(QKeySequence(QKeySequence::Quit));
+    action = editMenu->addAction(tr("Copy"));
+    action->setShortcut(QKeySequence(QKeySequence::Copy));
+    action = editMenu->addAction(tr("Paste"));
+    action->setShortcut(QKeySequence(QKeySequence::Paste));
+    action = editMenu->addAction(tr("Select All"));
+    action->setShortcut(QKeySequence(QKeySequence::SelectAll));
     QTabWidget *tabWidget = new QTabWidget;
     tabWidget->addTab(new FileDialogPanel, tr("QFileDialog"));
     tabWidget->addTab(new ColorDialogPanel, tr("QColorDialog"));
diff --git a/tests/manual/dialogs/printdialogpanel.cpp b/tests/manual/dialogs/printdialogpanel.cpp
index f7d027020c..1a18f94406 100644
--- a/tests/manual/dialogs/printdialogpanel.cpp
+++ b/tests/manual/dialogs/printdialogpanel.cpp
@@ -379,6 +379,7 @@ PrintDialogPanel::PrintDialogPanel(QWidget *parent)
     connect(m_panel.m_printButton, SIGNAL(clicked()), this, SLOT(showPrintDialog()));
     connect(m_panel.m_printPreviewButton, SIGNAL(clicked()), this, SLOT(showPreviewDialog()));
     connect(m_panel.m_pageSetupButton, SIGNAL(clicked()), this, SLOT(showPageSetupDialog()));
+    connect(m_panel.m_directPrintButton, SIGNAL(clicked()), this, SLOT(directPrint()));
 
     enablePanels();
     m_blockSignals = false;
@@ -686,6 +687,13 @@ void PrintDialogPanel::showPageSetupDialog()
         retrieveSettings(m_printer.data());
 }
 
+void PrintDialogPanel::directPrint()
+{
+    applySettings(m_printer.data());
+    print(m_printer.data());
+    retrieveSettings(m_printer.data());
+}
+
 #include "moc_printdialogpanel.cpp"
 #include "printdialogpanel.moc"
 
diff --git a/tests/manual/dialogs/printdialogpanel.h b/tests/manual/dialogs/printdialogpanel.h
index 3932cd174f..3d340c7ccc 100644
--- a/tests/manual/dialogs/printdialogpanel.h
+++ b/tests/manual/dialogs/printdialogpanel.h
@@ -101,6 +101,7 @@ private slots:
     void showPrintDialog();
     void showPreviewDialog();
     void showPageSetupDialog();
+    void directPrint();
     void unitsChanged();
     void pageSizeChanged();
     void pageDimensionsChanged();
diff --git a/tests/manual/dialogs/printdialogpanel.ui b/tests/manual/dialogs/printdialogpanel.ui
index 733d52ad9e..2f0fe606a3 100644
--- a/tests/manual/dialogs/printdialogpanel.ui
+++ b/tests/manual/dialogs/printdialogpanel.ui
@@ -644,6 +644,13 @@
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QPushButton" name="m_directPrintButton">
+          <property name="text">
+           <string>Direct Print</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>