summaryrefslogtreecommitdiffstats
path: root/src/kernel/ntqlayout.h
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-10-21 18:55:44 -0500
committerDarrell Anderson <[email protected]>2012-10-21 18:55:44 -0500
commit6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d (patch)
treef13bbebb928d6448ff186bc596fa58fa6b8892d9 /src/kernel/ntqlayout.h
parent56cd55070ee6c5267fde1aae4d5251e400dea64d (diff)
parent7608f0043b6dfc0b1adcaa8912793e1d3fe7b636 (diff)
downloadtqt3-6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d.tar.gz
tqt3-6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel/ntqlayout.h')
-rw-r--r--src/kernel/ntqlayout.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/ntqlayout.h b/src/kernel/ntqlayout.h
index 2405a7f15..ce170abc2 100644
--- a/src/kernel/ntqlayout.h
+++ b/src/kernel/ntqlayout.h
@@ -179,10 +179,10 @@ private:
class Q_EXPORT TQLayout : public TQObject, public TQLayoutItem
{
TQ_OBJECT
- Q_ENUMS( ResizeMode )
- Q_PROPERTY( int margin READ margin WRITE setMargin )
- Q_PROPERTY( int spacing READ spacing WRITE setSpacing )
- Q_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode )
+ TQ_ENUMS( ResizeMode )
+ TQ_PROPERTY( int margin READ margin WRITE setMargin )
+ TQ_PROPERTY( int spacing READ spacing WRITE setSpacing )
+ TQ_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode )
public:
// ### TQt 4.0: put 'Auto' first in enum