Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3

1 files changed, 8 insertions, 0 deletions

diff --git a/src/widgets/qprogressbar.h b/src/widgets/qprogressbar.h
index 2c4f039..ac69914 100644
--- a/src/widgets/qprogressbar.h
+++ b/src/widgets/qprogressbar.h
@@ -60,6 +60,7 @@ class Q_EXPORT QProgressBar : public QFrame
     Q_PROPERTY( bool centerIndicator READ centerIndicator WRITE setCenterIndicator )
     Q_PROPERTY( bool indicatorFollowsStyle READ indicatorFollowsStyle WRITE setIndicatorFollowsStyle )
     Q_PROPERTY( bool percentageVisible READ percentageVisible WRITE setPercentageVisible )
+    Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
 
 public:
     QProgressBar( QWidget* parent=0, const char* name=0, WFlags f=0 );
@@ -111,6 +112,13 @@ private:	// Disabled copy constructor and operator=
     QProgressBar( const QProgressBar & );
     QProgressBar &operator=( const QProgressBar & );
 #endif
+
+public:
+    virtual void setOrientation ( Orientation );
+    Orientation orientation () const;
+
+private:
+    Orientation m_orientation;
 };