diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-06-20 09:30:07 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-06-20 09:36:35 +0300 |
| commit | b04b2385c89f1b66ce2ae3b381d41090db5249e0 (patch) | |
| tree | 7fd9992fff74f300614fe7378e0ee004ca093ca8 /recipes-python/pyqt5/files/fix-sm.patch | |
| parent | f54f8401b268cb50d2f270e2da88d07c1c5e4148 (diff) | |
| parent | 6605c48f3a900da26425ef31d83eb1c95d551531 (diff) | |
| download | meta-qt5-b04b2385c89f1b66ce2ae3b381d41090db5249e0.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9
* upstream/master:
python-pyqt5: Add recipe
qwt: Add recipe
Change-Id: Id384afdd3cb5cc860cc1044431641cdb89aeac21
Diffstat (limited to 'recipes-python/pyqt5/files/fix-sm.patch')
| -rw-r--r-- | recipes-python/pyqt5/files/fix-sm.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/recipes-python/pyqt5/files/fix-sm.patch b/recipes-python/pyqt5/files/fix-sm.patch new file mode 100644 index 00000000..f2936a23 --- /dev/null +++ b/recipes-python/pyqt5/files/fix-sm.patch | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | --- PyQt5_gpl-5.8.2/sip/QtGui/qguiapplication.sip.orig 2017-05-13 13:28:42.523392315 -0400 | ||
| 2 | +++ PyQt5_gpl-5.8.2/sip/QtGui/qguiapplication.sip 2017-05-13 13:30:08.081207211 -0400 | ||
| 3 | @@ -270,12 +270,14 @@ | ||
| 4 | %End | ||
| 5 | |||
| 6 | public: | ||
| 7 | +%If (PyQt_SessionManager) | ||
| 8 | %If (Qt_5_6_0 -) | ||
| 9 | static bool isFallbackSessionManagementEnabled(); | ||
| 10 | %End | ||
| 11 | %If (Qt_5_6_0 -) | ||
| 12 | static void setFallbackSessionManagementEnabled(bool); | ||
| 13 | %End | ||
| 14 | +%End | ||
| 15 | |||
| 16 | signals: | ||
| 17 | %If (Qt_5_6_0 -) | ||