diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-08 07:01:15 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-08 07:01:15 (GMT) |
| commit | 23ae8b6badfd688f962590268a6147771d27266c (patch) | |
| tree | fc27f20c32e6dccbe39267214e65528b238ced70 /examples | |
| parent | 768cab51239a45f00d5ee3857efecd3d2cdcb99b (diff) | |
| parent | d4257360234a967bfbacde92ec2bb1ac8979b793 (diff) | |
| download | Qt-23ae8b6badfd688f962590268a6147771d27266c.zip Qt-23ae8b6badfd688f962590268a6147771d27266c.tar.gz Qt-23ae8b6badfd688f962590268a6147771d27266c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/network/http/httpwindow.cpp | 4 | ||||
| -rw-r--r-- | examples/richtext/textobject/textobject.pro | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp index ebde770..7aded07 100644 --- a/examples/network/http/httpwindow.cpp +++ b/examples/network/http/httpwindow.cpp @@ -116,8 +116,8 @@ void HttpWindow::downloadFile() if (QMessageBox::question(this, tr("HTTP"), tr("There already exists a file called %1 in " "the current directory. Overwrite?").arg(fileName), - QMessageBox::Ok|QMessageBox::Cancel, QMessageBox::Cancel) - == QMessageBox::Cancel) + QMessageBox::Yes|QMessageBox::No, QMessageBox::No) + == QMessageBox::No) return; QFile::remove(fileName); } diff --git a/examples/richtext/textobject/textobject.pro b/examples/richtext/textobject/textobject.pro index fbb809c..4fa9cb0 100644 --- a/examples/richtext/textobject/textobject.pro +++ b/examples/richtext/textobject/textobject.pro @@ -12,3 +12,7 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/richtext/textobject INSTALLS += target sources +filesToDeploy.sources = files/*.svg +filesToDeploy.path = files +DEPLOYMENT += filesToDeploy + |