summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-02-12 14:11:42 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-02-12 14:11:42 +0100
commit047191f1d23b27cf68e8f0db24ff918fb465b70b (patch)
tree98a576a36a42c85b840202ab5776f71588ad8264
parenta0723d9bf7fca719db2249178e1e066d94e9c2c1 (diff)
parent07d8ce32b1112dcb590c793ee51cb713e514011b (diff)
Merge remote-tracking branch 'origin/stable' into dev
-rw-r--r--examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.cpp b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.cpp
index 5fc60664..bdf450eb 100644
--- a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.cpp
+++ b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.cpp
@@ -75,6 +75,8 @@ int Directory:: filesCount() const{
Function called to append data onto list property
*/
void appendFiles(QDeclarativeListProperty<File> * property, File * file){
+ Q_UNUSED(property);
+ Q_UNUSED(file);
//Do nothing. can't add to a directory using this method
Q_UNUSED(property)
Q_UNUSED(file)