diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 4 | ||||
| -rw-r--r-- | examples/macextras/macfunctions/main.cpp | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index f0511dd..34387e8 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.0 +MODULE_VERSION = 6.0.0 diff --git a/dependencies.yaml b/dependencies.yaml new file mode 100644 index 0000000..aa6c7e9 --- /dev/null +++ b/dependencies.yaml @@ -0,0 +1,4 @@ +dependencies: + ../qtbase: + ref: 4cbadf699838406d14366ce61deec03cf45113f7 + required: true diff --git a/examples/macextras/macfunctions/main.cpp b/examples/macextras/macfunctions/main.cpp index 4daf0ac..0bfa136 100644 --- a/examples/macextras/macfunctions/main.cpp +++ b/examples/macextras/macfunctions/main.cpp @@ -64,7 +64,7 @@ int main(int argc, char **argv) // Pixmap <-> CGImage conversion QPixmap pixmap(":qtlogo.png"); - CGImageRef cgImage = QtMac::toCGImageRef(pixmap); + CGImageRef cgImage = pixmap.toImage().toCGImage(); QPixmap pixmap2 = QtMac::fromCGImageRef(cgImage); return app.exec(); |