From 5047ab2d2b96dc3349bb9b864aa632a54d3b9ff9 Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Thu, 31 May 2012 09:41:58 +0300 Subject: [PATCH] Disabled using: framework AppKit framework WebKit It solves crashes JS on MAC with Qt 4.8. It was been used for parse urls from Safari. It seems to now that code is useless, so ti is disabled for a testing. --- Sankore_3.1.pro | 5 +++-- src/frameworks/UBPlatformUtils_mac.mm | 9 +++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index 2fa4818d..3786f0b3 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -134,8 +134,9 @@ win32 { macx { LIBS += -framework Foundation LIBS += -lcrypto - LIBS += -framework AppKit - LIBS += -framework WebKit + #commented because Sankore crashes on Java Script. It seems to backends dependencies. + #LIBS += -framework AppKit + #LIBS += -framework WebKit CONFIG(release, debug|release):CONFIG += x86 diff --git a/src/frameworks/UBPlatformUtils_mac.mm b/src/frameworks/UBPlatformUtils_mac.mm index 78f41d21..e94d254b 100644 --- a/src/frameworks/UBPlatformUtils_mac.mm +++ b/src/frameworks/UBPlatformUtils_mac.mm @@ -10,8 +10,12 @@ #import #import #import + +/* +// commented because Sankore crashes on Java Script. It seems to backends dependencies. #import #import +*/ NSString* bundleShortVersion(NSBundle *bundle) @@ -543,13 +547,14 @@ void UBPlatformUtils::destroyKeyboardLayouts() QString UBPlatformUtils::urlFromClipboard() { QString qsRet; - +/* + // commented because Sankore crashes on Java Script. It seems to backends dependencies. NSPasteboard* pPasteboard = [NSPasteboard pasteboardWithName:@"Apple CFPasteboard drag"]; WebArchive* pArchive = [[WebArchive alloc] initWithData:[pPasteboard dataForType:@"com.apple.webarchive"]]; qsRet = [[[[pArchive mainResource] URL] absoluteString] UTF8String]; [pArchive release]; - +*/ return qsRet; }