diff options
author | Darrell Anderson <[email protected]> | 2012-10-21 13:11:21 -0500 |
---|---|---|
committer | Darrell Anderson <[email protected]> | 2012-10-21 13:11:21 -0500 |
commit | 7bdcf7b7a990e5024a865d801cd16df9d6e8a3e2 (patch) | |
tree | 713b8b19d0bff547fb7a12d8f36b7ab5e48bbbd2 /tdeui/kfontcombo.h | |
parent | 5d9a593c1fe4967f3636524cbef739d80b0d8cae (diff) | |
parent | fe43761567120b0bda4e0aed56b7c1e56bdd93c5 (diff) | |
download | tdelibs-7bdcf7b7a990e5024a865d801cd16df9d6e8a3e2.tar.gz tdelibs-7bdcf7b7a990e5024a865d801cd16df9d6e8a3e2.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdeui/kfontcombo.h')
-rw-r--r-- | tdeui/kfontcombo.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tdeui/kfontcombo.h b/tdeui/kfontcombo.h index aec6618a4..9b480ff18 100644 --- a/tdeui/kfontcombo.h +++ b/tdeui/kfontcombo.h @@ -35,12 +35,12 @@ class TDEUI_EXPORT KFontCombo : public KComboBox { Q_OBJECT - Q_PROPERTY(TQString family READ currentFont WRITE setCurrentFont) - Q_PROPERTY(bool bold READ bold WRITE setBold DESIGNABLE true) - Q_PROPERTY(bool italic READ italic WRITE setItalic DESIGNABLE true) - Q_PROPERTY(bool underline READ underline WRITE setUnderline DESIGNABLE true) - Q_PROPERTY(bool strikeOut READ strikeOut WRITE setStrikeOut DESIGNABLE true) - Q_PROPERTY(int fontSize READ size WRITE setSize DESIGNABLE true) + TQ_PROPERTY(TQString family READ currentFont WRITE setCurrentFont) + TQ_PROPERTY(bool bold READ bold WRITE setBold DESIGNABLE true) + TQ_PROPERTY(bool italic READ italic WRITE setItalic DESIGNABLE true) + TQ_PROPERTY(bool underline READ underline WRITE setUnderline DESIGNABLE true) + TQ_PROPERTY(bool strikeOut READ strikeOut WRITE setStrikeOut DESIGNABLE true) + TQ_PROPERTY(int fontSize READ size WRITE setSize DESIGNABLE true) public: /** * Constructor |