Merge branch 'master' into StandardButton__or__

Author: altendky

CHANGELOG.md

@@ -4,9 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## 5.15.1.0 [unreleased]
+## 5.15.2.0 [unreleased]
 
 ### Added
+* [#125](https://github.com/stlehmann/PyQt5-stubs/pull/125) on `QtWidgets.QMessageBox`, enumerators are also attributes of their enumerations
 * [#99](https://github.com/stlehmann/PyQt5-stubs/pull/99) enable mypy's strict mode
 * [#92](https://github.com/stlehmann/PyQt5-stubs/pull/92) add `Sequence` methods and `.__setitem__()` to `sip.array`
 * [#94](https://github.com/stlehmann/PyQt5-stubs/pull/94) add several operators to `QIODevice.OpenMode` and `QIODevice.OpenModeFlag`
@@ -17,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 * [#109](https://github.com/stlehmann/PyQt5-stubs/pull/109) `.__or__()` for `QMessageBox.StandardButton` and `QMessageBox.StandardButtons`
+* [#126](https://github.com/stlehmann/PyQt5-stubs/pull/126) fix `QCoreApplication.instance()` return type to be optional
 * [#102](https://github.com/stlehmann/PyQt5-stubs/pull/102) fix `pyqtSlot` parameter typing and overloads
 * [#104](https://github.com/stlehmann/PyQt5-stubs/pull/104) `sip.voidptr` handles integer values and sequences and takes `self`
 * [#103](https://github.com/stlehmann/PyQt5-stubs/pull/103) `pyqtBoundSignal.disconnect()`'s `slot` parameter is optional

PyQt5-stubs/QtCore.pyi

@@ -3020,7 +3020,7 @@ class QCoreApplication(QObject):
     @staticmethod
     def exec_() -> int: ...
     @staticmethod
-    def instance() -> 'QCoreApplication': ...
+    def instance() -> typing.Optional['QCoreApplication']: ...
     @staticmethod
     def arguments() -> typing.List[str]: ...
     @staticmethod

PyQt5-stubs/QtWidgets.pyi

@@ -6483,6 +6483,34 @@ class QMessageBox(QDialog):
         @typing.overload
         def __or__(self, other: int) -> int: ...
 
+        NoButton = ... # type: 'QMessageBox.StandardButton'
+        Ok = ... # type: 'QMessageBox.StandardButton'
+        Save = ... # type: 'QMessageBox.StandardButton'
+        SaveAll = ... # type: 'QMessageBox.StandardButton'
+        Open = ... # type: 'QMessageBox.StandardButton'
+        Yes = ... # type: 'QMessageBox.StandardButton'
+        YesToAll = ... # type: 'QMessageBox.StandardButton'
+        No = ... # type: 'QMessageBox.StandardButton'
+        NoToAll = ... # type: 'QMessageBox.StandardButton'
+        Abort = ... # type: 'QMessageBox.StandardButton'
+        Retry = ... # type: 'QMessageBox.StandardButton'
+        Ignore = ... # type: 'QMessageBox.StandardButton'
+        Close = ... # type: 'QMessageBox.StandardButton'
+        Cancel = ... # type: 'QMessageBox.StandardButton'
+        Discard = ... # type: 'QMessageBox.StandardButton'
+        Help = ... # type: 'QMessageBox.StandardButton'
+        Apply = ... # type: 'QMessageBox.StandardButton'
+        Reset = ... # type: 'QMessageBox.StandardButton'
+        RestoreDefaults = ... # type: 'QMessageBox.StandardButton'
+        FirstButton = ... # type: 'QMessageBox.StandardButton'
+        LastButton = ... # type: 'QMessageBox.StandardButton'
+        YesAll = ... # type: 'QMessageBox.StandardButton'
+        NoAll = ... # type: 'QMessageBox.StandardButton'
+        Default = ... # type: 'QMessageBox.StandardButton'
+        Escape = ... # type: 'QMessageBox.StandardButton'
+        FlagMask = ... # type: 'QMessageBox.StandardButton'
+        ButtonMask = ... # type: 'QMessageBox.StandardButton'
+
     NoButton = ... # type: 'QMessageBox.StandardButton'
     Ok = ... # type: 'QMessageBox.StandardButton'
     Save = ... # type: 'QMessageBox.StandardButton'
@@ -6511,14 +6539,31 @@ class QMessageBox(QDialog):
     FlagMask = ... # type: 'QMessageBox.StandardButton'
     ButtonMask = ... # type: 'QMessageBox.StandardButton'
 
-    class Icon(int): ...
+    class Icon(int):
+        NoIcon = ... # type: 'QMessageBox.Icon'
+        Information = ... # type: 'QMessageBox.Icon'
+        Warning = ... # type: 'QMessageBox.Icon'
+        Critical = ... # type: 'QMessageBox.Icon'
+        Question = ... # type: 'QMessageBox.Icon'
+
     NoIcon = ... # type: 'QMessageBox.Icon'
     Information = ... # type: 'QMessageBox.Icon'
     Warning = ... # type: 'QMessageBox.Icon'
     Critical = ... # type: 'QMessageBox.Icon'
     Question = ... # type: 'QMessageBox.Icon'
 
-    class ButtonRole(int): ...
+    class ButtonRole(int):
+        InvalidRole = ... # type: 'QMessageBox.ButtonRole'
+        AcceptRole = ... # type: 'QMessageBox.ButtonRole'
+        RejectRole = ... # type: 'QMessageBox.ButtonRole'
+        DestructiveRole = ... # type: 'QMessageBox.ButtonRole'
+        ActionRole = ... # type: 'QMessageBox.ButtonRole'
+        HelpRole = ... # type: 'QMessageBox.ButtonRole'
+        YesRole = ... # type: 'QMessageBox.ButtonRole'
+        NoRole = ... # type: 'QMessageBox.ButtonRole'
+        ResetRole = ... # type: 'QMessageBox.ButtonRole'
+        ApplyRole = ... # type: 'QMessageBox.ButtonRole'
+
     InvalidRole = ... # type: 'QMessageBox.ButtonRole'
     AcceptRole = ... # type: 'QMessageBox.ButtonRole'
     RejectRole = ... # type: 'QMessageBox.ButtonRole'