Changeset 846 for trunk/src/gui/dialogs/qprogressdialog.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/dialogs/qprogressdialog.cpp (modified) (6 diffs)

trunk/src/gui/dialogs/qprogressdialog.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -47 +47 @@
 #include "qpainter.h"
 #include "qdrawutil.h"
-#include "qdatetime.h"
 #include "qlabel.h"
 #include "qprogressbar.h"
@@ -55 +54 @@
 #include "qcursor.h"
 #include "qtimer.h"
+
 #include <private/qdialog_p.h>
 #include <limits.h>
@@ -104 +104 @@
     bool shown_once;
     bool cancellation_flag;
-    QTime starttime;
+    Q starttime;
 #ifndef QT_NO_CURSOR
     QCursor parentCursor;
@@ -154 +154 @@
         bool(q->style()->styleHint(QStyle::SH_ProgressDialog_CenterCancelButton, 0, q));
 
+
+
+
+
+
+
+
     QSize cs = cancel ? cancel->sizeHint() : QSize(0,0);
     QSize bh = bar->sizeHint();
@@ -186 +193 @@
 
     if (label)
-        label->setGeometry(mlr, 0, q->width()-mlr*2, lh);
-    bar->setGeometry(mlr, lh+sp, q->width()-mlr*2, bh.height());
+        label->setGeometry(mlr, 2, lh);
+    bar->setGeometry(mlr, lh2, bh.height());
 }