diff options
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qdatetimeedit.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qdatetimeedit_p.h | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qmenu.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index 4c418bde9e..b916212871 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -2598,7 +2598,7 @@ void QCalendarPopup::setCalendarWidget(QCalendarWidget *cw) widgetLayout->setSpacing(0); } delete calendar.data(); - calendar = QWeakPointer<QCalendarWidget>(cw); + calendar = QPointer<QCalendarWidget>(cw); widgetLayout->addWidget(cw); connect(cw, SIGNAL(activated(QDate)), this, SLOT(dateSelected(QDate))); diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h index 35f0f57f54..f7e6861677 100644 --- a/src/widgets/widgets/qdatetimeedit_p.h +++ b/src/widgets/widgets/qdatetimeedit_p.h @@ -173,7 +173,7 @@ protected: private: QCalendarWidget *verifyCalendarInstance(); - QWeakPointer<QCalendarWidget> calendar; + QPointer<QCalendarWidget> calendar; QDate oldDate; bool dateChanged; }; diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 8d50b03edb..4747d1c661 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -1098,7 +1098,7 @@ void QMenuPrivate::_q_actionTriggered() { Q_Q(QMenu); if (QAction *action = qobject_cast<QAction *>(q->sender())) { - QWeakPointer<QAction> actionGuard = action; + QPointer<QAction> actionGuard = action; emit q->triggered(action); if (!activationRecursionGuard && actionGuard) { //in case the action has not been activated by the mouse |