diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:10:15 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:10:15 +0100 |
| commit | 3b5c0bc0780f1749fed7c07bd8b691400a0282b7 (patch) | |
| tree | 1022f5553ad5a0aca9b5f3b49ca38a01c2329d20 /src/plugins/platforms/cocoa/cocoa.pro | |
| parent | c79918733a194ebbe5a2fe1617c884659f3e4b9f (diff) | |
| parent | 21f1738a94fc8544ece04b3b1ee03a11986fe59b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/image/qjpeghandler.cpp
Change-Id: I9db3acea7d5c82f5da679c8eaeb29431136665f0
Diffstat (limited to 'src/plugins/platforms/cocoa/cocoa.pro')
| -rw-r--r-- | src/plugins/platforms/cocoa/cocoa.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index d8cd32255c..a60f4adc28 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -81,7 +81,7 @@ HEADERS += qcocoaintegration.h \ RESOURCES += qcocoaresources.qrc -LIBS += -framework Cocoa -framework Carbon -framework IOKit +LIBS += -framework Cocoa -framework Carbon -framework IOKit -lcups QT += core-private gui-private platformsupport-private @@ -90,11 +90,13 @@ qtHaveModule(widgets) { qpaintengine_mac.mm \ qprintengine_mac.mm \ qcocoaprintersupport.mm \ + qcocoaprintdevice.mm \ HEADERS += \ qpaintengine_mac_p.h \ qprintengine_mac_p.h \ qcocoaprintersupport.h \ + qcocoaprintdevice.h \ QT += widgets-private printsupport-private } |