From a670a0a8ae4e649de90c5e5c39276d683c11f7e0 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Wed, 15 Jul 2015 15:51:09 +0200 Subject: Doc: Replace Mac OS X with OS X Task-number: QTBUG-40759 Change-Id: I1c05a2d07f38da1129bc127fd17c15f843b16bda Reviewed-by: Venugopal Shivashankar --- src/declarative/graphicsitems/qdeclarativetextinput.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/declarative/graphicsitems') diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 3ff75fd7..263197b6 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE and setting \l echoMode to an appropriate value enables TextInput to be used for a password input field. - On Mac OS X, the Up/Down key bindings for Home/End are explicitly disabled. + On OS X, the Up/Down key bindings for Home/End are explicitly disabled. If you want such bindings (on any platform), you will need to construct them in QML. \sa TextEdit, Text, {declarative/text/textselection}{Text Selection example} -- cgit v1.2.3 From a6fe61915ef46b300975faa394736344046e600c Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sun, 6 Mar 2016 14:10:43 +0100 Subject: Make public headers compile with -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I1ef66cc4a88f71ae804c2f19e59456bc6b55f6c6 Task-number: QTBUG-45291 Reviewed-by: Friedemann Kleint --- src/declarative/graphicsitems/qdeclarativeitem.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/declarative/graphicsitems') diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h index b97a6525..b6c7da0f 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.h +++ b/src/declarative/graphicsitems/qdeclarativeitem.h @@ -95,7 +95,7 @@ public: BottomLeft, Bottom, BottomRight }; - QDeclarativeItem(QDeclarativeItem *parent = 0); + QDeclarativeItem(QDeclarativeItem *parent = Q_NULLPTR); virtual ~QDeclarativeItem(); QDeclarativeItem *parentItem() const; @@ -182,7 +182,7 @@ protected: const QRectF &oldGeometry); protected: - QDeclarativeItem(QDeclarativeItemPrivate &dd, QDeclarativeItem *parent = 0); + QDeclarativeItem(QDeclarativeItemPrivate &dd, QDeclarativeItem *parent = Q_NULLPTR); private: Q_DISABLE_COPY(QDeclarativeItem) -- cgit v1.2.3 From ce4d4941b9182bd65479e2b3f3e507aa381e3f8c Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sun, 6 Mar 2016 14:11:23 +0100 Subject: Make more ctors explicit Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. One is even a protected ctor. Change-Id: If047884d130206b8ea42148476ab449c2cbf7529 Reviewed-by: Friedemann Kleint --- src/declarative/graphicsitems/qdeclarativeitem.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/declarative/graphicsitems') diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h index b6c7da0f..d1f6e6c7 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.h +++ b/src/declarative/graphicsitems/qdeclarativeitem.h @@ -95,7 +95,7 @@ public: BottomLeft, Bottom, BottomRight }; - QDeclarativeItem(QDeclarativeItem *parent = Q_NULLPTR); + explicit QDeclarativeItem(QDeclarativeItem *parent = Q_NULLPTR); virtual ~QDeclarativeItem(); QDeclarativeItem *parentItem() const; @@ -182,7 +182,7 @@ protected: const QRectF &oldGeometry); protected: - QDeclarativeItem(QDeclarativeItemPrivate &dd, QDeclarativeItem *parent = Q_NULLPTR); + explicit QDeclarativeItem(QDeclarativeItemPrivate &dd, QDeclarativeItem *parent = Q_NULLPTR); private: Q_DISABLE_COPY(QDeclarativeItem) -- cgit v1.2.3 From e960ecdeb9a2dec5917ffba6bf607f124713ae53 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sun, 6 Mar 2016 14:13:41 +0100 Subject: Export QDeclarativeTextEditPrivate, QDeclarativeLayoutItem They are used in tests and while these tests don't call functions on them, a ubsan build will need and fail to access the type_info for these classes. Change-Id: I4badf9f70f4153acd3caea865ff137e443cb0a8d Reviewed-by: Friedemann Kleint --- src/declarative/graphicsitems/qdeclarativelayoutitem_p.h | 2 +- src/declarative/graphicsitems/qdeclarativetextedit_p_p.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/declarative/graphicsitems') diff --git a/src/declarative/graphicsitems/qdeclarativelayoutitem_p.h b/src/declarative/graphicsitems/qdeclarativelayoutitem_p.h index d4ff419b..449d025d 100644 --- a/src/declarative/graphicsitems/qdeclarativelayoutitem_p.h +++ b/src/declarative/graphicsitems/qdeclarativelayoutitem_p.h @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class QDeclarativeLayoutItem : public QDeclarativeItem, public QGraphicsLayoutItem +class Q_AUTOTEST_EXPORT QDeclarativeLayoutItem : public QDeclarativeItem, public QGraphicsLayoutItem { Q_OBJECT Q_INTERFACES(QGraphicsLayoutItem) diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h index 16659082..2622052b 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QTextLayout; class QTextDocument; class QWidgetTextControl; -class QDeclarativeTextEditPrivate : public QDeclarativeImplicitSizePaintedItemPrivate +class Q_AUTOTEST_EXPORT QDeclarativeTextEditPrivate : public QDeclarativeImplicitSizePaintedItemPrivate { Q_DECLARE_PUBLIC(QDeclarativeTextEdit) -- cgit v1.2.3