summaryrefslogtreecommitdiffstats
path: root/src/dialogs/qprogressdialog.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-08-03 08:49:35 -0500
committerDarrell Anderson <[email protected]>2012-08-03 08:49:35 -0500
commit92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a (patch)
tree3de07468347367bdef8e6c0d765bdb209585a189 /src/dialogs/qprogressdialog.cpp
parentda067173fd2ab6bca5943294a439c4992323227a (diff)
parentebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (diff)
downloadqt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.tar.gz
qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/dialogs/qprogressdialog.cpp')
-rw-r--r--src/dialogs/qprogressdialog.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp
index bdae310..d90b46e 100644
--- a/src/dialogs/qprogressdialog.cpp
+++ b/src/dialogs/qprogressdialog.cpp
@@ -573,7 +573,7 @@ int QProgressDialog::progress() const
void QProgressDialog::setProgress( int progress )
{
if ( progress == bar()->progress() ||
- bar()->progress() == -1 && progress == bar()->totalSteps() )
+ ( bar()->progress() == -1 && progress == bar()->totalSteps() ) )
return;
bar()->setProgress(progress);