diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 18:55:44 -0500 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 18:55:44 -0500 |
commit | 6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d (patch) | |
tree | f13bbebb928d6448ff186bc596fa58fa6b8892d9 /src/dialogs/ntqprogressdialog.h | |
parent | 56cd55070ee6c5267fde1aae4d5251e400dea64d (diff) | |
parent | 7608f0043b6dfc0b1adcaa8912793e1d3fe7b636 (diff) | |
download | tqt-6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d.tar.gz tqt-6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/dialogs/ntqprogressdialog.h')
-rw-r--r-- | src/dialogs/ntqprogressdialog.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/dialogs/ntqprogressdialog.h b/src/dialogs/ntqprogressdialog.h index 77b8af109..404fa5e3d 100644 --- a/src/dialogs/ntqprogressdialog.h +++ b/src/dialogs/ntqprogressdialog.h @@ -56,14 +56,14 @@ class TQProgressDialogData; class Q_EXPORT TQProgressDialog : public TQDialog { TQ_OBJECT - Q_PROPERTY( bool wasCancelled READ wasCancelled DESIGNABLE false STORED false ) // ### remove in 4.0 - Q_PROPERTY( bool wasCanceled READ wasCanceled ) - Q_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps ) - Q_PROPERTY( int progress READ progress WRITE setProgress ) - Q_PROPERTY( bool autoReset READ autoReset WRITE setAutoReset ) - Q_PROPERTY( bool autoClose READ autoClose WRITE setAutoClose ) - Q_PROPERTY( int minimumDuration READ minimumDuration WRITE setMinimumDuration ) - Q_PROPERTY( TQString labelText READ labelText WRITE setLabelText ) + TQ_PROPERTY( bool wasCancelled READ wasCancelled DESIGNABLE false STORED false ) // ### remove in 4.0 + TQ_PROPERTY( bool wasCanceled READ wasCanceled ) + TQ_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps ) + TQ_PROPERTY( int progress READ progress WRITE setProgress ) + TQ_PROPERTY( bool autoReset READ autoReset WRITE setAutoReset ) + TQ_PROPERTY( bool autoClose READ autoClose WRITE setAutoClose ) + TQ_PROPERTY( int minimumDuration READ minimumDuration WRITE setMinimumDuration ) + TQ_PROPERTY( TQString labelText READ labelText WRITE setLabelText ) public: TQProgressDialog( TQWidget* parent=0, const char* name=0, bool modal=FALSE, |