diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qlist.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 6dfd8e3ab1..485193b071 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -88,6 +88,7 @@ Qt { Q_FLAGS(KeyboardModifiers MouseButtons) Q_ENUMS(WindowType WindowState WindowModality WidgetAttribute ApplicationAttribute) Q_FLAGS(WindowFlags WindowStates) + Q_ENUMS(FocusReason) Q_ENUMS(InputMethodHint InputMethodQuery) Q_FLAGS(InputMethodHints InputMethodQueries) Q_ENUMS(ScreenOrientation) @@ -101,6 +102,7 @@ Qt { Q_ENUMS(CursorMoveStyle) Q_ENUMS(TimerType) Q_ENUMS(ScrollPhase) + Q_ENUMS(MouseEventSource) #endif // defined(Q_MOC_RUN) #if defined(Q_MOC_RUN) diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index 8cfd1a8f8b..39c1c46f6e 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -130,7 +130,7 @@ public: #ifdef Q_COMPILER_INITIALIZER_LISTS inline QList(std::initializer_list<T> args) : d(const_cast<QListData::Data *>(&QListData::shared_null)) - { reserve(args.size()); std::copy(args.begin(), args.end(), std::back_inserter(*this)); } + { reserve(int(args.size())); std::copy(args.begin(), args.end(), std::back_inserter(*this)); } #endif bool operator==(const QList<T> &l) const; inline bool operator!=(const QList<T> &l) const { return !(*this == l); } |