diff options
| author | Marius Kintel <marius@kintel.net> | 2013-03-11 14:20:40 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-03-11 14:20:40 (GMT) |
| commit | a1308a6a5ea36ff51a1d96264cc2bc2cd8618831 (patch) | |
| tree | 662d1b92630c996f3e58f550505216c44c9d9154 /src | |
| parent | 20b2a709f925201c2100861ffda83e1b612c1795 (diff) | |
| parent | e05bbaf5ea033755f30ff4fea87d3b710091363b (diff) | |
Merge branch 'master' of github.com:openscad/openscad
Conflicts:
openscad.pro
Diffstat (limited to 'src')
| -rw-r--r-- | src/openscad.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openscad.cc b/src/openscad.cc index 75d7b9d..682ccb7 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -55,7 +55,9 @@ #ifdef Q_WS_MAC #include "EventFilter.h" #include "AppleEvents.h" -#include "SparkleAutoUpdater.h" +#ifdef OPENSCAD_DEPLOY + #include "SparkleAutoUpdater.h" +#endif #endif #include "Camera.h" @@ -483,13 +485,11 @@ int main(int argc, char **argv) installAppleEventHandlers(); #endif -#ifndef DEBUG -#ifdef Q_WS_MAC +#if defined(OPENSCAD_DEPLOY) && defined(Q_WS_MAC) AutoUpdater *updater = new SparkleAutoUpdater; AutoUpdater::setUpdater(updater); if (updater->automaticallyChecksForUpdates()) updater->checkForUpdates(); #endif -#endif QString qfilename; if (filename) qfilename = QString::fromStdString(boosty::stringy(boosty::absolute(filename))); |