summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs/qfileinfogatherer_p.h
diff options
context:
space:
mode:
authorIain <qt-info@nokia.com>2009-08-20 18:45:18 (GMT)
committerIain <qt-info@nokia.com>2009-08-20 18:45:18 (GMT)
commit5f312095bf30aa54ba45a98c2db777fb57b6aee8 (patch)
tree2bd82e28b8b5a8fc0a8aaffd6cc63f3bf3ac98a0 /src/gui/dialogs/qfileinfogatherer_p.h
parent6c2cabdc96c48637b18a1cb294d38e4ddb2f280d (diff)
parent4ba5a86f530e93c179c9049d36b2f38595a5ef09 (diff)
downloadQt-5f312095bf30aa54ba45a98c2db777fb57b6aee8.zip
Qt-5f312095bf30aa54ba45a98c2db777fb57b6aee8.tar.gz
Qt-5f312095bf30aa54ba45a98c2db777fb57b6aee8.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/gui/dialogs/qfileinfogatherer_p.h')
-rw-r--r--src/gui/dialogs/qfileinfogatherer_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfileinfogatherer_p.h b/src/gui/dialogs/qfileinfogatherer_p.h
index cb980d2..bab4a29 100644
--- a/src/gui/dialogs/qfileinfogatherer_p.h
+++ b/src/gui/dialogs/qfileinfogatherer_p.h
@@ -184,7 +184,7 @@ private:
QMutex mutex;
QWaitCondition condition;
- bool abort;
+ volatile bool abort;
QStack<QString> path;
QStack<QStringList> files;