summaryrefslogtreecommitdiffstats
path: root/tests/manual/dialogs/printdialogpanel.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2014-06-30 15:01:08 +0200
committerFriedemann Kleint <Friedemann.Kleint@digia.com>2014-07-08 12:06:07 +0200
commitd376e95047626983ffd8ecd50028f8614bbf2371 (patch)
tree7e6c9a60337a0fc7c872f8e485bde3bc06445a54 /tests/manual/dialogs/printdialogpanel.cpp
parentea09c9961a36f3acd576ab9e761e53cce4cf4514 (diff)
Fix compilation of the manual dialog test with Qt 4.
Task-number: QTBUG-27186 Change-Id: I959c060930ad8a3fa6606be6df0562a96a18eac7 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'tests/manual/dialogs/printdialogpanel.cpp')
-rw-r--r--tests/manual/dialogs/printdialogpanel.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/manual/dialogs/printdialogpanel.cpp b/tests/manual/dialogs/printdialogpanel.cpp
index e316486fcf..2e6477df03 100644
--- a/tests/manual/dialogs/printdialogpanel.cpp
+++ b/tests/manual/dialogs/printdialogpanel.cpp
@@ -422,8 +422,9 @@ QSizeF PrintDialogPanel::customPageSize() const
// Apply the settings to the QPrinter
void PrintDialogPanel::applySettings(QPrinter *printer) const
{
- QString printerName = m_panel.m_printerCombo->currentData().toString();
- if (printerName == QStringLiteral("PdfFormat"))
+ const int currentIndex = m_panel.m_printerCombo->currentIndex();
+ QString printerName = m_panel.m_printerCombo->itemData(currentIndex).toString();
+ if (printerName == QLatin1String("PdfFormat"))
printer->setOutputFileName(m_panel.m_fileName->text());
else
printer->setPrinterName(printerName);
@@ -459,7 +460,7 @@ void PrintDialogPanel::retrieveSettings(const QPrinter *printer)
m_panel.m_printerCombo->setCurrentIndex(m_panel.m_printerCombo->findData(QVariant(printer->printerName())));
m_panel.m_fileName->setEnabled(false);
} else {
- m_panel.m_printerCombo->setCurrentIndex(m_panel.m_printerCombo->findData(QVariant(QStringLiteral("PdfFormat"))));
+ m_panel.m_printerCombo->setCurrentIndex(m_panel.m_printerCombo->findData(QVariant(QLatin1String("PdfFormat"))));
m_panel.m_fileName->setEnabled(true);
}
m_panel.m_fileName->setText(printer->outputFileName());
@@ -662,10 +663,11 @@ void PrintDialogPanel::layoutModeChanged()
void PrintDialogPanel::printerChanged()
{
- bool isPdf = (m_panel.m_printerCombo->currentData().toString() == QStringLiteral("PdfFormat"));
+ const int currentIndex = m_panel.m_printerCombo->currentIndex();
+ const bool isPdf = (m_panel.m_printerCombo->itemData(currentIndex).toString() == QLatin1String("PdfFormat"));
m_panel.m_fileName->setEnabled(isPdf);
if (isPdf && m_panel.m_fileName->text().isEmpty())
- m_panel.m_fileName->setText(QDir::homePath() + QDir::separator() + QStringLiteral("print.pdf"));
+ m_panel.m_fileName->setText(QDir::homePath() + QDir::separator() + QLatin1String("print.pdf"));
}
void PrintDialogPanel::showPrintDialog()