diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-20 15:33:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-20 15:33:22 (GMT) |
| commit | c6b9ed9c2c0a8617e1d076fcad8f72e60156f455 (patch) | |
| tree | 8faa169904719b53dc708463b0b125a8bac9fedf /src/gui/widgets/qdatetimeedit.h | |
| parent | 5b1d33a8e53d74098b6a42775e39cd61cb8001c5 (diff) | |
| parent | dafd0da322157ffd784374a810826821a180be24 (diff) | |
| download | Qt-c6b9ed9c2c0a8617e1d076fcad8f72e60156f455.zip Qt-c6b9ed9c2c0a8617e1d076fcad8f72e60156f455.tar.gz Qt-c6b9ed9c2c0a8617e1d076fcad8f72e60156f455.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:
QGraphicsView: fix few artefacts that can appear if the changed() signal is connected.
tst_qmetaobject: fix compilation, now that wrong NOTIFY property fails
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); |