diff options
Diffstat (limited to 'examples/widgets')
| -rw-r--r-- | examples/widgets/scribble/mainwindow.cpp | 6 | ||||
| -rw-r--r-- | examples/widgets/stylesheet/stylesheeteditor.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/widgets/scribble/mainwindow.cpp b/examples/widgets/scribble/mainwindow.cpp index 4a59e93a61..00bf9884c9 100644 --- a/examples/widgets/scribble/mainwindow.cpp +++ b/examples/widgets/scribble/mainwindow.cpp @@ -239,12 +239,12 @@ bool MainWindow::saveFile(const QByteArray &fileFormat) QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), initialPath, tr("%1 Files (*.%2);;All Files (*)") - .arg(QString(fileFormat.toUpper())) - .arg(QString(fileFormat))); + .arg(QString::fromLatin1(fileFormat.toUpper())) + .arg(QString::fromLatin1(fileFormat))); if (fileName.isEmpty()) { return false; } else { - return scribbleArea->saveImage(fileName, fileFormat); + return scribbleArea->saveImage(fileName, fileFormat.constData()); } } //! [20] diff --git a/examples/widgets/stylesheet/stylesheeteditor.cpp b/examples/widgets/stylesheet/stylesheeteditor.cpp index 88f5100d12..5514291a7f 100644 --- a/examples/widgets/stylesheet/stylesheeteditor.cpp +++ b/examples/widgets/stylesheet/stylesheeteditor.cpp @@ -85,7 +85,7 @@ void StyleSheetEditor::loadStyleSheet(const QString &sheetName) { QFile file(":/qss/" + sheetName.toLower() + ".qss"); file.open(QFile::ReadOnly); - QString styleSheet = QLatin1String(file.readAll()); + QString styleSheet = QString::fromLatin1(file.readAll()); ui.styleTextEdit->setPlainText(styleSheet); qApp->setStyleSheet(styleSheet); |