1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation of the manual dialog test with Qt 4.

Browse Source 
Task-number: QTBUG-27186
Change-Id: I959c060930ad8a3fa6606be6df0562a96a18eac7
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
This commit is contained in:
Friedemann Kleint 2014-06-30 15:01:08 +02:00
parent ea09c9961a
commit d376e95047
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/manual/dialogs/printdialogpanel.cpp
View File

@ -422,8 +422,9 @@ QSizeF PrintDialogPanel::customPageSize() const
// Apply the settings to the QPrinter // Apply the settings to the QPrinter
void PrintDialogPanel::applySettings(QPrinter *printer) const void PrintDialogPanel::applySettings(QPrinter *printer) const
{ {
QString printerName = m_panel.m_printerCombo->currentData().toString(); const int currentIndex = m_panel.m_printerCombo->currentIndex();
if (printerName == QStringLiteral("PdfFormat")) QString printerName = m_panel.m_printerCombo->itemData(currentIndex).toString();
if (printerName == QLatin1String("PdfFormat"))
printer->setOutputFileName(m_panel.m_fileName->text()); printer->setOutputFileName(m_panel.m_fileName->text());
else else
printer->setPrinterName(printerName); 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_printerCombo->setCurrentIndex(m_panel.m_printerCombo->findData(QVariant(printer->printerName())));
m_panel.m_fileName->setEnabled(false); m_panel.m_fileName->setEnabled(false);
} else { } 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->setEnabled(true);
} }
m_panel.m_fileName->setText(printer->outputFileName()); m_panel.m_fileName->setText(printer->outputFileName());
@ -662,10 +663,11 @@ void PrintDialogPanel::layoutModeChanged()
void PrintDialogPanel::printerChanged() 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); m_panel.m_fileName->setEnabled(isPdf);
if (isPdf && m_panel.m_fileName->text().isEmpty()) 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() void PrintDialogPanel::showPrintDialog()