mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
@@ -0,0 +1,27 @@
|
||||
From bb7cbdede46f72468bbb1b9bbefd43a1dbad21c0 Mon Sep 17 00:00:00 2001
|
||||
From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
|
||||
Date: Mon, 30 Jan 2017 18:28:15 +0100
|
||||
Subject: [PATCH] remove WindowOkButtonHint and WindowCancelButtonHint from
|
||||
qnamespace.sip as they are removed from qt5.8
|
||||
|
||||
Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
|
||||
---
|
||||
sip/QtCore/qnamespace.sip | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/sip/QtCore/qnamespace.sip b/sip/QtCore/qnamespace.sip
|
||||
index 2db83b7..559f410 100644
|
||||
--- a/sip/QtCore/qnamespace.sip
|
||||
+++ b/sip/QtCore/qnamespace.sip
|
||||
@@ -209,8 +209,6 @@ namespace Qt
|
||||
WindowContextHelpButtonHint,
|
||||
WindowShadeButtonHint,
|
||||
WindowStaysOnTopHint,
|
||||
- WindowOkButtonHint,
|
||||
- WindowCancelButtonHint,
|
||||
WindowStaysOnBottomHint,
|
||||
WindowCloseButtonHint,
|
||||
MacWindowToolBarButtonHint,
|
||||
--
|
||||
2.7.4
|
||||
|
||||
Reference in New Issue
Block a user