diff --git a/doc/release-checklist.txt b/doc/release-checklist.txt index 9e7c6e0a..bd1cf3af 100644 --- a/doc/release-checklist.txt +++ b/doc/release-checklist.txt @@ -64,6 +64,7 @@ o Notify package managers - Fedora: Miro Hrončok or - OpenSUSE: Pavol Rusnak - MacPorts: Frank Schima + - Arch Linux: Kyle Keen Build and Upload Release Binaries --------------------------------- diff --git a/openscad.pro b/openscad.pro index 0da75f41..9f8e75f3 100644 --- a/openscad.pro +++ b/openscad.pro @@ -13,6 +13,10 @@ # # http://en.wikibooks.org/wiki/OpenSCAD_User_Manual +!experimental { + message("If you're building a development binary, consider adding CONFIG+=experimental") +} + isEmpty(QT_VERSION) { error("Please use qmake for Qt 4 (probably qmake-qt4)") } diff --git a/src/AboutDialog.html b/src/AboutDialog.html index 65a54d71..be666b67 100644 --- a/src/AboutDialog.html +++ b/src/AboutDialog.html @@ -92,6 +92,8 @@ Please visit this link for a copy of the license: chrysn
  • Fedora maintainer: Miro Hrončok +
  • Arch Linux maintainer: + Kyle Keen

    diff --git a/src/Preferences.ui b/src/Preferences.ui index 0fe9c9ea..4c76c7eb 100644 --- a/src/Preferences.ui +++ b/src/Preferences.ui @@ -386,7 +386,7 @@ - + 75 diff --git a/src/QGLView.h b/src/QGLView.h index 402a5d48..aaab8f57 100644 --- a/src/QGLView.h +++ b/src/QGLView.h @@ -40,7 +40,7 @@ public: else this->cam.projection = Camera::PERSPECTIVE; } std::string getRendererInfo() const; -#if QT_VERSION >= 0x050000 +#if QT_VERSION >= 0x050001 float getDPI() { return this->devicePixelRatio(); } #endif bool save(const char *filename); diff --git a/src/openscad.cc b/src/openscad.cc index c6fc6f0c..76973661 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -551,7 +551,7 @@ int gui(vector &inputFiles, const fs::path &original_path, int argc, cha new MainWindow(assemblePath(original_path, infile)); } #else - MainWindow *m = new MainWindow(assemblePath(original_path, inputFiles[0])); + new MainWindow(assemblePath(original_path, inputFiles[0])); #endif app.connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit())); int rc = app.exec();