summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Komissarov <ABBAPOH@me.com>2013-07-02 14:57:32 +0400
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-03 21:38:37 +0200
commit4634b7516d3c3a62c239f1e4f7a308ba0603bcdb (patch)
treefa50c8f56d60fa67e4c84059ef342aa1b0b3e77f
parenteeffcfbd89a0b386c5757e8c67b76c5bccc84ffd (diff)
Remove qWarning() in qt_mac_image_to_cgimage()
Change-Id: I839aa44735910012bf57daa9c8b55c5e6def3cd2 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
-rw-r--r--src/plugins/platforms/cocoa/qcocoahelpers.mm5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
index 09d1a96789..3ade0a2a45 100644
--- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
@@ -84,11 +84,8 @@ static void drawImageReleaseData (void *info, const void *, size_t)
CGImageRef qt_mac_image_to_cgimage(const QImage &img)
{
- if (img.width() <= 0 || img.height() <= 0) {
- qWarning() << Q_FUNC_INFO <<
- "trying to set" << img.width() << "x" << img.height() << "size for CGImage";
+ if (img.isNull())
return 0;
- }
QImage *image;
if (img.depth() != 32)