diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-19 18:44:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-19 18:44:04 (GMT) |
| commit | a385e4d78b201e4ea5ff8be299b7d7c3d58edc4e (patch) | |
| tree | 481fffa07906601b8e5e0cbafe9edba2781177d4 /src/gui/widgets/qdatetimeedit.h | |
| parent | a1014603b66ef5c15cab043333ed63eaaf3c646e (diff) | |
| parent | ba277e9ce92dc40e648f6c83a7cd9f01dd33b886 (diff) | |
| download | Qt-a385e4d78b201e4ea5ff8be299b7d7c3d58edc4e.zip Qt-a385e4d78b201e4ea5ff8be299b7d7c3d58edc4e.tar.gz Qt-a385e4d78b201e4ea5ff8be299b7d7c3d58edc4e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed autotest compilation issue on solaris
Fixed build issue on Solaris
Remove wrong NOTIFY attribute.
Ignore LayoutDirectionChange event in QTextControl
Fix an obvious bug in tst_QGL::clipTest()
moc: Error if the NOTIFY signal is invalid.
QDateEdit/QTimeEdit: remove duplicate properties.
Diffstat (limited to 'src/gui/widgets/qdatetimeedit.h')
| -rw-r--r-- | src/gui/widgets/qdatetimeedit.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/widgets/qdatetimeedit.h b/src/gui/widgets/qdatetimeedit.h index 81bbdb9..d2f315a 100644 --- a/src/gui/widgets/qdatetimeedit.h +++ b/src/gui/widgets/qdatetimeedit.h @@ -206,7 +206,6 @@ private: class Q_GUI_EXPORT QTimeEdit : public QDateTimeEdit { Q_OBJECT - Q_PROPERTY(QTime time READ time WRITE setTime NOTIFY timeChanged USER true) public: QTimeEdit(QWidget *parent = 0); QTimeEdit(const QTime &time, QWidget *parent = 0); @@ -215,7 +214,6 @@ public: class Q_GUI_EXPORT QDateEdit : public QDateTimeEdit { Q_OBJECT - Q_PROPERTY(QDate date READ date WRITE setDate NOTIFY dateChanged USER true) public: QDateEdit(QWidget *parent = 0); QDateEdit(const QDate &date, QWidget *parent = 0); |