diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-08-15 13:22:36 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-08-16 08:54:37 +0300 |
| commit | 7beedb16cd1ab7afd7ace29a2eea3f5f7d7140a3 (patch) | |
| tree | 3d949c250bf8a45046a4fb7e4421260776d961ba /recipes-python/pyqt5/files/fix-sm.patch | |
| parent | 826c0b1092ede76f17de3b232ba7cc17a5be5830 (diff) | |
| parent | 41e4144d4d8c50b52ed6224a28f2ca4042c1e5b2 (diff) | |
| download | meta-qt5-7beedb16cd1ab7afd7ace29a2eea3f5f7d7140a3.tar.gz | |
Merge remote-tracking branch 'qtyocto/5.9' into 5.10
* qtyocto/5.9:
qt5: update submodules
qtbase: update to 5.9.1 RC3
qt5: update submodules
qt5: update submodules
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9
qt5: update submodules
qtwebengine: fix build with latest oe-core
qtremoteobjects: build repc tool for native and nativesdk
qtlocation: make mapbox-gl plugin a PACKAGECONFIG option
qtwebview: add recipe for Qt WebView
qtbase: update to 5.9.0 RC2
Change-Id: Icc5a568edf1f21032a4746eb003bcb111d01bc0f
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 -) | ||