diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-10 23:22:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-10 23:22:23 +0200 |
| commit | bcbec4bc49774b80780872c8234acb256c38d779 (patch) | |
| tree | 038e1c47f9156877b89a840fb69947e0774218b4 /examples | |
| parent | 507a7b4df918a091c45af35110fd2cdeff3713aa (diff) | |
| parent | 2346ae167568bb9e5d247da0b946067b7f9aad48 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/widgets/richtext/textedit/textedit.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp index ae2bdedf13..873a29eb0e 100644 --- a/examples/widgets/richtext/textedit/textedit.cpp +++ b/examples/widgets/richtext/textedit/textedit.cpp @@ -436,8 +436,7 @@ bool TextEdit::maybeSave() { if (!textEdit->document()->isModified()) return true; - if (fileName.startsWith(QLatin1String(":/"))) - return true; + QMessageBox::StandardButton ret; ret = QMessageBox::warning(this, tr("Application"), tr("The document has been modified.\n" @@ -485,6 +484,8 @@ bool TextEdit::fileSave() { if (fileName.isEmpty()) return fileSaveAs(); + if (fileName.startsWith(QStringLiteral(":/"))) + return fileSaveAs(); QTextDocumentWriter writer(fileName); bool success = writer.write(textEdit->document()); |