diff options
Diffstat (limited to 'src/openscad.cc')
| -rw-r--r-- | src/openscad.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/openscad.cc b/src/openscad.cc index 5c21fa9..ad6cbf9 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -463,7 +463,7 @@ static QString assemblePath(const fs::path& absoluteBase, bool QtUseGUI() { -#ifdef Q_WS_X11 +#ifdef Q_OS_X11 // see <http://qt.nokia.com/doc/4.5/qapplication.html#QApplication-2>: // On X11, the window system is initialized if GUIenabled is true. If GUIenabled // is false, the application does not connect to the X server. On Windows and @@ -486,7 +486,7 @@ int gui(vector<string> &inputFiles, const fs::path &original_path, int argc, cha } #endif QApplication app(argc, argv, true); //useGUI); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC app.installEventFilter(new EventFilter(&app)); #endif // set up groups for QSettings @@ -499,7 +499,7 @@ int gui(vector<string> &inputFiles, const fs::path &original_path, int argc, cha QDir exdir(app_path); QString qexamplesdir; -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC exdir.cd("../Resources"); // Examples can be bundled if (!exdir.exists("examples")) exdir.cd("../../.."); #elif defined(Q_OS_UNIX) @@ -519,11 +519,11 @@ int gui(vector<string> &inputFiles, const fs::path &original_path, int argc, cha MainWindow::setExamplesDir(qexamplesdir); parser_init(app_path.toLocal8Bit().constData()); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC installAppleEventHandlers(); #endif -#if defined(OPENSCAD_DEPLOY) && defined(Q_WS_MAC) +#if defined(OPENSCAD_DEPLOY) && defined(Q_OS_MAC) AutoUpdater *updater = new SparkleAutoUpdater; AutoUpdater::setUpdater(updater); if (updater->automaticallyChecksForUpdates()) updater->checkForUpdates(); @@ -560,7 +560,7 @@ int gui(const vector<string> &inputFiles, const fs::path &original_path, int arg int main(int argc, char **argv) { int rc = 0; -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC set_output_handler(CocoaUtils::nslog, NULL); #endif #ifdef ENABLE_CGAL |