diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-08 07:08:07 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-08 07:08:07 (GMT) |
| commit | 16663479c6fb57bf1e734d0dc1c1a92c7f2fb3e5 (patch) | |
| tree | ab79addcad3ed7584795469333dda3b291132b23 /examples | |
| parent | 267891cb23e0e751873f9a6cf5dd951287c0e5e5 (diff) | |
| parent | 75fc8ab96ee142ade5362eeaa94ce7e47ebcb579 (diff) | |
| download | Qt-16663479c6fb57bf1e734d0dc1c1a92c7f2fb3e5.zip Qt-16663479c6fb57bf1e734d0dc1c1a92c7f2fb3e5.tar.gz Qt-16663479c6fb57bf1e734d0dc1c1a92c7f2fb3e5.tar.bz2 | |
Merge branch 'softkeys' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys_without_stack
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 + |