From patchwork Tue May 19 08:23:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 48734 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A850E21411 for ; Tue, 19 May 2015 08:27:53 +0000 (UTC) Received: by wivs14 with SMTP id s14sf4375731wiv.1 for ; Tue, 19 May 2015 01:27:53 -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:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=2NRNTRxOtutJ40NWhER9sqOM4n4f6wLuKeaythrG9a8=; b=gLVHxwYzwnVYaNItdJeNlUsyAmpqVCBmdKIp1htByIo90fwf6AZQGGYQNILAi1GX0B 3+P28dHC9FJUUYjSqUvFPrJcxwGmH9l2S5t7TsBNmr2z1eQ+xQSKdPgXszoG8OoeH6Gs CCDW2LgcWcRXVwVMnAUm7eigI51W1lXpkQipuF2OZbxTOB7DNIkeDnpI7BkOMBxXWMvp WzNkHdkGCcMSIvZtER38IB/uQVXko6lDeR58Ck/LCDDEqg5eJaljD8SqV2wCHNxlJdwJ RqJk0S2Ccq6lqYM3Z/IuYe+W2EwHhpUrHn/M1PqzB12iqBfqSk/cEZxZdctsdelFeBxS VDdg== X-Gm-Message-State: ALoCoQnqCtH5XjlxP70IE+09WnvkfqyuBfS43eMiE+AxicXzrhWGc/IBMrI7uEzs3D+/LNNt3kDu X-Received: by 10.152.37.101 with SMTP id x5mr21115006laj.5.1432024072286; Tue, 19 May 2015 01:27:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.10 with SMTP id p10ls25842lag.29.gmail; Tue, 19 May 2015 01:27:52 -0700 (PDT) X-Received: by 10.112.204.199 with SMTP id la7mr20617349lbc.114.1432024072011; Tue, 19 May 2015 01:27:52 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id lf11si8388776lac.24.2015.05.19.01.27.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 May 2015 01:27:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by lagv1 with SMTP id v1so11625189lag.3 for ; Tue, 19 May 2015 01:27:51 -0700 (PDT) X-Received: by 10.152.37.228 with SMTP id b4mr20166372lak.117.1432024071925; Tue, 19 May 2015 01:27:51 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp627014lbb; Tue, 19 May 2015 01:27:51 -0700 (PDT) X-Received: by 10.55.43.38 with SMTP id r38mr55659385qkh.80.1432024070527; Tue, 19 May 2015 01:27:50 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y195si1093937qky.81.2015.05.19.01.27.50 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 19 May 2015 01:27:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:44439 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YucsP-0004N4-Lp for patch@linaro.org; Tue, 19 May 2015 04:27:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33866) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yucop-0006OJ-Mk for qemu-devel@nongnu.org; Tue, 19 May 2015 04:24:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yucoh-0006Gt-IN for qemu-devel@nongnu.org; Tue, 19 May 2015 04:24:07 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34176) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yucoh-0006GF-CG for qemu-devel@nongnu.org; Tue, 19 May 2015 04:23:59 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Yucoe-0000be-6U; Tue, 19 May 2015 09:23:56 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 19 May 2015 09:23:53 +0100 Message-Id: <1432023835-2274-9-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1432023835-2274-1-git-send-email-peter.maydell@linaro.org> References: <1432023835-2274-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PULL 08/10] ui/cocoa: Don't use NSWindow useOptimizedDrawing on OSX 10.10 and up X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.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.215.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Starting in OSX 10.10, NSWindow useOptimizedDrawing is deprecated, so don't use it there. Signed-off-by: Peter Maydell Message-id: 1431296361-16981-6-git-send-email-peter.maydell@linaro.org --- 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;