diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-03 00:18:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-03 00:56:41 +0200 |
| commit | e6286ca289db11463d13ec4d31055995b32ad258 (patch) | |
| tree | 944bd3a2e93691bdd977ef7818b8241c1193d888 /src/plugins/platforms/cocoa/qcocoaprintdevice.mm | |
| parent | beb7258a56b6ec76531b73cc07ee30132a3f548f (diff) | |
| parent | 9ae89313e43689483282ac330ad189db89bfcbba (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Manually fixed up: isES -> isOpenGLES
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Change-Id: I57d2ef26c3d4a7b40ace09f4e8560b7686650ea5
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaprintdevice.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaprintdevice.mm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaprintdevice.mm b/src/plugins/platforms/cocoa/qcocoaprintdevice.mm index 57d5c800e0..7322025df6 100644 --- a/src/plugins/platforms/cocoa/qcocoaprintdevice.mm +++ b/src/plugins/platforms/cocoa/qcocoaprintdevice.mm @@ -463,7 +463,11 @@ bool QCocoaPrintDevice::openPpdFile() ppdClose(m_ppd); m_ppd = 0; CFURLRef ppdURL = NULL; +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 + char ppdPath[PATH_MAX]; +#else char ppdPath[MAXPATHLEN]; +#endif if (PMPrinterCopyDescriptionURL(m_printer, kPMPPDDescriptionType, &ppdURL) == noErr && ppdURL != NULL && CFURLGetFileSystemRepresentation(ppdURL, true, (UInt8*)ppdPath, sizeof(ppdPath))) { |