Remove QPlatformNativeInterface functions for CGImage conversion
QMacExtras no longer use them. Clients who need the functionality should use QImage::toCGImage(), or qt_mac_toQImage() from QtGui's private qcoregraphics_p.h, until we've made a public verion of it. Task-number: QTBUG-83252 Change-Id: If74d05afe8f4ce6728d8c503bd97f7632583fbed Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
parent
7cafcd4867
commit
c856033851
@ -118,10 +118,6 @@ private:
|
||||
// Function to return NSMenu * from QPlatformMenuBar
|
||||
static void *qMenuBarToNSMenu(QPlatformMenuBar *platformMenuBar);
|
||||
|
||||
// QImage <-> CGImage conversion functions
|
||||
static CGImageRef qImageToCGImage(const QImage &image);
|
||||
static QImage cgImageToQImage(CGImageRef image);
|
||||
|
||||
// Set a QWindow as a "guest" (subwindow) of a non-QWindow
|
||||
static void setEmbeddedInForeignView(QPlatformWindow *window, bool embedded);
|
||||
|
||||
|
@ -127,10 +127,6 @@ QPlatformNativeInterface::NativeResourceForIntegrationFunction QCocoaNativeInter
|
||||
return NativeResourceForIntegrationFunction(QCocoaNativeInterface::qMenuToNSMenu);
|
||||
if (resource.toLower() == "qmenubartonsmenu")
|
||||
return NativeResourceForIntegrationFunction(QCocoaNativeInterface::qMenuBarToNSMenu);
|
||||
if (resource.toLower() == "qimagetocgimage")
|
||||
return NativeResourceForIntegrationFunction(QCocoaNativeInterface::qImageToCGImage);
|
||||
if (resource.toLower() == "cgimagetoqimage")
|
||||
return NativeResourceForIntegrationFunction(QCocoaNativeInterface::cgImageToQImage);
|
||||
if (resource.toLower() == "registertouchwindow")
|
||||
return NativeResourceForIntegrationFunction(QCocoaNativeInterface::registerTouchWindow);
|
||||
if (resource.toLower() == "setembeddedinforeignview")
|
||||
@ -279,16 +275,6 @@ void *QCocoaNativeInterface::qMenuBarToNSMenu(QPlatformMenuBar *platformMenuBar)
|
||||
return reinterpret_cast<void *>(menu);
|
||||
}
|
||||
|
||||
CGImageRef QCocoaNativeInterface::qImageToCGImage(const QImage &image)
|
||||
{
|
||||
return qt_mac_toCGImage(image);
|
||||
}
|
||||
|
||||
QImage QCocoaNativeInterface::cgImageToQImage(CGImageRef image)
|
||||
{
|
||||
return qt_mac_toQImage(image);
|
||||
}
|
||||
|
||||
void QCocoaNativeInterface::setEmbeddedInForeignView(QPlatformWindow *window, bool embedded)
|
||||
{
|
||||
Q_UNUSED(embedded); // "embedded" state is now automatically detected
|
||||
|
Loading…
Reference in New Issue
Block a user