From patchwork Sun May 10 22:19:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 48188 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D357C2121F for ; Sun, 10 May 2015 22:19:25 +0000 (UTC) Received: by wiz9 with SMTP id 9sf5238229wiz.3 for ; Sun, 10 May 2015 15:19:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=8tqSbDoGV6GIiNfENMS/w7gCNVhWDUd9762+MChzaTk=; b=givC25ou7JYpALqHa0wqvNsGCQeLf+NGJe+wCWGsVbCrR1pC2/VNfAw8oLXY+2QPke iwzjelkavvFjSgKVUuUFmxJAj36RSo6edmUa3UC6D+cd5Zqs2bFiA87kIX1VdE9ci56H coiLrIaCGqezMuj2QucDtV0+IonCOftg/zmpzGZ3E/EmHUpDjWQljuzCzB+TOycII8Ru NkNgjxRpC+C5j7v43YTGy2PZacsC41HLj0AJK3/+EseUm0RiAkaFSJe0gJi3YFBSfYC3 GGCLIbWlfJ23T8qjNNEN6H1bssF4APIXzBwv9ltZ+q40mm5JKLrOLYqQmNZIcvWsBKr3 q4DQ== X-Gm-Message-State: ALoCoQk521dNwixWfs/FdN4dh2MwMH/AB4pOPSjxAXj49Gjz8hKr5PmbHeNH2yMX/2DuaK6rFTAE X-Received: by 10.152.37.101 with SMTP id x5mr5649263laj.5.1431296365142; Sun, 10 May 2015 15:19:25 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.205.70 with SMTP id le6ls579767lac.50.gmail; Sun, 10 May 2015 15:19:24 -0700 (PDT) X-Received: by 10.112.25.69 with SMTP id a5mr5849704lbg.16.1431296364837; Sun, 10 May 2015 15:19:24 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id l7si7170386lae.121.2015.05.10.15.19.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 May 2015 15:19:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by lbcga7 with SMTP id ga7so82674272lbc.1 for ; Sun, 10 May 2015 15:19:24 -0700 (PDT) X-Received: by 10.152.236.40 with SMTP id ur8mr5954612lac.19.1431296364379; Sun, 10 May 2015 15:19:24 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1195920lbb; Sun, 10 May 2015 15:19:24 -0700 (PDT) X-Received: by 10.194.121.68 with SMTP id li4mr15248087wjb.84.1431296363772; Sun, 10 May 2015 15:19:23 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id 20si19116062wjz.5.2015.05.10.15.19.23 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 10 May 2015 15:19:23 -0700 (PDT) Received-SPF: none (google.com: pm215@archaic.org.uk does not designate permitted sender hosts) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1YrZZC-0004Qg-73; Sun, 10 May 2015 23:19:22 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Programmingkid , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Subject: [PATCH 5/6] ui/cocoa: Don't use NSWindow useOptimizedDrawing on OSX 10.10 and up Date: Sun, 10 May 2015 23:19:20 +0100 Message-Id: <1431296361-16981-6-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1431296361-16981-1-git-send-email-peter.maydell@linaro.org> References: <1431296361-16981-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Starting in OSX 10.10, NSWindow useOptimizedDrawing is deprecated, so don't use it there. Signed-off-by: Peter Maydell --- ui/cocoa.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ui/cocoa.m b/ui/cocoa.m index e7b29e0..fade0fd 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -36,6 +36,9 @@ #ifndef MAC_OS_X_VERSION_10_6 #define MAC_OS_X_VERSION_10_6 1060 #endif +#ifndef MAC_OS_X_VERSION_10_10 +#define MAC_OS_X_VERSION_10_10 101000 +#endif //#define DEBUG @@ -824,7 +827,9 @@ QemuCocoaView *cocoaView; [normalWindow setAcceptsMouseMovedEvents:YES]; [normalWindow setTitle:[NSString stringWithFormat:@"QEMU"]]; [normalWindow setContentView:cocoaView]; +#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_10) [normalWindow useOptimizedDrawing:YES]; +#endif [normalWindow makeKeyAndOrderFront:self]; [normalWindow center]; stretch_video = false;