diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 13:11:21 -0500 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 13:11:21 -0500 |
commit | 7bdcf7b7a990e5024a865d801cd16df9d6e8a3e2 (patch) | |
tree | 713b8b19d0bff547fb7a12d8f36b7ab5e48bbbd2 /tdeui/kcombobox.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/kcombobox.h')
-rw-r--r-- | tdeui/kcombobox.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h index 93ae6535e..de3b07aab 100644 --- a/tdeui/kcombobox.h +++ b/tdeui/kcombobox.h @@ -151,10 +151,10 @@ class KURL; class TDEUI_EXPORT KComboBox : public TQComboBox, public KCompletionBase { Q_OBJECT - Q_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion ) - Q_PROPERTY( bool contextMenuEnabled READ isContextMenuEnabled WRITE setContextMenuEnabled ) - Q_PROPERTY( bool urlDropsEnabled READ isURLDropsEnabled WRITE setURLDropsEnabled ) - Q_PROPERTY( bool trapReturnKey READ trapReturnKey WRITE setTrapReturnKey ) + TQ_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion ) + TQ_PROPERTY( bool contextMenuEnabled READ isContextMenuEnabled WRITE setContextMenuEnabled ) + TQ_PROPERTY( bool urlDropsEnabled READ isURLDropsEnabled WRITE setURLDropsEnabled ) + TQ_PROPERTY( bool trapReturnKey READ trapReturnKey WRITE setTrapReturnKey ) public: @@ -540,7 +540,7 @@ class KPixmapProvider; class TDEUI_EXPORT KHistoryCombo : public KComboBox { Q_OBJECT - Q_PROPERTY( TQStringList historyItems READ historyItems WRITE setHistoryItems ) + TQ_PROPERTY( TQStringList historyItems READ historyItems WRITE setHistoryItems ) public: /** |