lib/cutego
1
0
Fork 0
mirror of https://github.com/bluszcz/cutego.git synced 2024-09-28 21:25:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix network enum + qml & quick modules on 5.6

Browse source
This commit is contained in:
therecipe 2017-02-20 16:44:45 +01:00
parent cc0c5bf2f2
commit c6ada02b90
3 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/binding/parser/helper.go
View file

@ -140,15 +140,15 @@ var LibDeps = map[string][]string{
"Widgets": {"Gui", "Core"},
"Sql": {"Widgets", "Gui", "Core"}, //Widgets, Gui
"MacExtras": {"Gui", "Core"},
"Qml": {"QuickControls2", "Network", "Core"},
"Qml": {"Network", "Core"},
"WebSockets": {"Network", "Core"},
"XmlPatterns": {"Network", "Core"},
"Bluetooth": {"Core"},
"WebChannel": {"Network", "Qml", "Core"}, //Network (needed for static linking ios)
"Svg": {"Widgets", "Gui", "Core"},
"Multimedia": {"MultimediaWidgets", "Widgets", "Network", "Gui", "Core"}, //MultimediaWidgets, Widgets
"Quick": {"QuickControls2", "QuickWidgets", "Widgets", "Network", "Qml", "Gui", "Core"}, //QuickWidgets, Widgets, Network (needed for static linking ios)
"Help": {"Sql", "CLucene", "Network", "Widgets", "Gui", "Core"}, //Sql + CLucene + Network (needed for static linking ios)
"Multimedia": {"MultimediaWidgets", "Widgets", "Network", "Gui", "Core"}, //MultimediaWidgets, Widgets
"Quick": {"QuickWidgets", "Widgets", "Network", "Qml", "Gui", "Core"}, //QuickWidgets, Widgets, Network (needed for static linking ios)
"Help": {"Sql", "CLucene", "Network", "Widgets", "Gui", "Core"}, //Sql + CLucene + Network (needed for static linking ios)
"Location": {"Positioning", "Quick", "Gui", "Core"},
"ScriptTools": {"Script", "Widgets", "Core"}, //Script, Widgets
"UiTools": {"Widgets", "Gui", "Core"},

3
internal/binding/templater/enum_cpp.go
View file

@ -20,7 +20,8 @@ func cppEnumBody(enum *parser.Enum, value *parser.Value) string {
//needed for sailfish with 5.6 docs
if strings.HasPrefix(value.Name, "MV_") || strings.HasPrefix(value.Name, "PM_") ||
strings.HasPrefix(value.Name, "SH_") || strings.HasPrefix(value.Name, "ISODate") {
strings.HasPrefix(value.Name, "SH_") || strings.HasPrefix(value.Name, "ISODate") ||
strings.HasPrefix(value.Name, "TlsV1_") {
return fmt.Sprintf(`#if QT_VERSION >= 0x056000
return %v::%v;
#else

30
network/network.cpp
View file

@ -6322,12 +6322,20 @@ void* QNetworkSession_MetaObjectDefault(void* ptr)
int QSsl_TlsV1_1_Type()
{
return QSsl::TlsV1_1;
#if QT_VERSION >= 0x056000
return QSsl::TlsV1_1;
#else
return 0;
#endif
}
int QSsl_TlsV1_2_Type()
{
return QSsl::TlsV1_2;
#if QT_VERSION >= 0x056000
return QSsl::TlsV1_2;
#else
return 0;
#endif
}
int QSsl_AnyProtocol_Type()
@ -6347,17 +6355,29 @@ int QSsl_SecureProtocols_Type()
int QSsl_TlsV1_0OrLater_Type()
{
return QSsl::TlsV1_0OrLater;
#if QT_VERSION >= 0x056000
return QSsl::TlsV1_0OrLater;
#else
return 0;
#endif
}
int QSsl_TlsV1_1OrLater_Type()
{
return QSsl::TlsV1_1OrLater;
#if QT_VERSION >= 0x056000
return QSsl::TlsV1_1OrLater;
#else
return 0;
#endif
}
int QSsl_TlsV1_2OrLater_Type()
{
return QSsl::TlsV1_2OrLater;
#if QT_VERSION >= 0x056000
return QSsl::TlsV1_2OrLater;
#else
return 0;
#endif
}
struct QtNetwork_PackedList QSslCertificate_QSslCertificate_FromData(void* data, long long format)