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/widgets/ntqlabel.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/widgets/ntqlabel.h')
| -rw-r--r-- | src/widgets/ntqlabel.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/widgets/ntqlabel.h b/src/widgets/ntqlabel.h index 5e978931f..b1d439fcd 100644 --- a/src/widgets/ntqlabel.h +++ b/src/widgets/ntqlabel.h @@ -53,13 +53,13 @@ class TQLabelPrivate; class Q_EXPORT TQLabel : public TQFrame { TQ_OBJECT - Q_PROPERTY( TQString text READ text WRITE setText ) - Q_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat ) - Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap ) - Q_PROPERTY( bool scaledContents READ hasScaledContents WRITE setScaledContents ) - Q_PROPERTY( Alignment alignment READ alignment WRITE setAlignment ) - Q_PROPERTY( int indent READ indent WRITE setIndent ) - Q_OVERRIDE( BackgroundMode backgroundMode DESIGNABLE true) + TQ_PROPERTY( TQString text READ text WRITE setText ) + TQ_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat ) + TQ_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap ) + TQ_PROPERTY( bool scaledContents READ hasScaledContents WRITE setScaledContents ) + TQ_PROPERTY( Alignment alignment READ alignment WRITE setAlignment ) + TQ_PROPERTY( int indent READ indent WRITE setIndent ) + TQ_OVERRIDE( BackgroundMode backgroundMode DESIGNABLE true) public: TQLabel( TQWidget *parent, const char* name=0, WFlags f=0 ); |
