fotowall.icns @@ -294,8 +294,8 @@ class Matrix3 #include <math.h> #include <stdio.h> -#ifdef Q_OS_WIN32 -//sincos is not defined in win32 +#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) +//sincos is not defined in win32 and MAC static inline void sincos(double th, double *s, double *c) { *s = sin(th); 3rdparty/enricomath.h @@ -2,7 +2,7 @@ VPATH += $$PWD INCLUDEPATH += $$PWD DEPENDPATH += $$PWD -unix { +unix:!macx { DEFINES += HAS_VIDEOCAPTURE HEADERS += bayer.h \ 3rdparty/videocapture/videocapture.pri @@ -216,8 +216,8 @@ void FotoWall::savePoster() Controller controller(&posterazor, wizard); controller.setImageLoadingAvailable(false); controller.setPosterSizeModeAvailable(Types::PosterSizeModePercentual, false); - QDialog dialog(this, Qt::WindowMinMaxButtonsHint); - dialog.setModal(true); + QDialog dialog(this, Qt::CustomizeWindowHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint); + dialog.setWindowTitle(tr("Export poster")); dialog.setLayout(new QVBoxLayout); dialog.layout()->addWidget(wizard); dialog.resize(640, 480); FotoWall.cpp @@ -74,8 +74,15 @@ win32 { RC_FILE = fotowall.rc } +macx { + ICON = fotowall.icns + CONFIG += x86 ppc + QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 +} + # handling static image plugins -contains(CONFIG, static) { +contains(CONFIG, static)|contains(CONFIG, qt_no_framework) { QTPLUGIN += qgif \ qjpeg \ qsvg \ fotowall.pro @@ -36,10 +36,12 @@ QColor RenderOpts::hiColor; int main( int argc, char ** args ) { +#if !defined(Q_OS_MAC) // raster on OSX == b0rken // use the Raster GraphicsSystem as default on 4.5+ #if QT_VERSION >= 0x040500 QApplication::setGraphicsSystem("raster"); #endif +#endif QApplication app(argc, args); app.setApplicationName("FotoWall"); main.cpp 9aca5d6881557fd3d260214edff980f3b225e807 Enrico Ros enrico.ros@gmail.com http://github.com/enricoros/fotowall/commit/bc7c40b88897594a60d09931262bbc33b764169d bc7c40b88897594a60d09931262bbc33b764169d 2009-04-28T11:03:20-07:00 2009-04-28T11:03:20-07:00 Cumulative MAC fixes. Squashed commit of the following (by Alessandro Portale): commit a0bb70f615dd656f3f583adc647a6e71549db15e Date: Tue Apr 28 18:14:03 2009 +0200 Mac specifics. Mainly ICON. commit d914979a76a17a4f910439e4e96e3762dbf0bbba Date: Tue Apr 28 18:04:17 2009 +0200 Mac icon (sampled the available 64x64 png to native 128x128) commit 6a3b5702baf240ad8f893d8b44bcc55c069e74c6 Date: Tue Apr 28 17:54:48 2009 +0200 Tweak window flags of posterazor to be usable on Mac commit c4a1c6f7dce0ca1a4d541b32099bce1c28b36de3 Date: Tue Apr 28 17:29:22 2009 +0200 Mac fixes a074eb63f569e7ca3663e132933c5dbae5b108cc Enrico Ros enrico.ros@gmail.com