diff options
| author | Ariya Hidayat <ariya.hidayat@nokia.com> | 2009-06-05 15:41:58 (GMT) |
|---|---|---|
| committer | Ariya Hidayat <ariya.hidayat@nokia.com> | 2009-06-05 15:41:58 (GMT) |
| commit | e873cbdec9098856df2c2b584cee73ea0c5563ff (patch) | |
| tree | 7d4bdc53f8c1b6da0c24772fe7908ce0271cf3a4 /examples | |
| parent | 7e53a66171ee3358abe4b022ce0fa721259fa604 (diff) | |
| parent | 9691523b796c6acc6a837a5f5a34fef16aa74c48 (diff) | |
| download | Qt-e873cbdec9098856df2c2b584cee73ea0c5563ff.zip Qt-e873cbdec9098856df2c2b584cee73ea0c5563ff.tar.gz Qt-e873cbdec9098856df2c2b584cee73ea0c5563ff.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-graphicseffect
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/animation/stickman/node.h | 2 | ||||
| -rw-r--r-- | examples/network/http/httpwindow.cpp | 4 | ||||
| -rw-r--r-- | examples/richtext/textobject/textobject.pro | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/examples/animation/stickman/node.h b/examples/animation/stickman/node.h index 72eae87..8654144 100644 --- a/examples/animation/stickman/node.h +++ b/examples/animation/stickman/node.h @@ -47,7 +47,7 @@ class Node: public QObject, public QGraphicsItem { Q_OBJECT - Q_PROPERTY(QPointF position READ pos WRITE setPos); + Q_PROPERTY(QPointF position READ pos WRITE setPos) public: Node(const QPointF &pos, QGraphicsItem *parent = 0); ~Node(); 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 + |