Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:openscad/openscad into issue680

  • Loading branch information...
commit 3de6986d8fafbf9789257ebc020f60ddf37d6bd7 2 parents 780d897 + c6520e2
@donbright donbright authored
View
1  doc/release-checklist.txt
@@ -64,6 +64,7 @@ o Notify package managers
- Fedora: Miro Hrončok <miro@hroncok.cz> or <mhroncok@redhat.com>
- OpenSUSE: Pavol Rusnak <prusnak@opensuse.org>
- MacPorts: Frank Schima <macports2000@gmail.com>
+ - Arch Linux: Kyle Keen <keenerd@gmail.com>
Build and Upload Release Binaries
---------------------------------
View
4 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)")
}
View
2  src/AboutDialog.html
@@ -92,6 +92,8 @@
<a href="http://christian.amsuess.com/">chrysn</a></lu>
<li><a href="http://fedoraproject.org/">Fedora</a> maintainer:</b>
<a href="http://hroncok.cz/">Miro Hrončok</a></lu>
+<li><a href="https://www.archlinux.org">Arch Linux</a> maintainer:</b>
+ <a href="http://kmkeen.com">Kyle Keen</a></lu>
</ul>
<p>
View
2  src/Preferences.ui
@@ -386,7 +386,7 @@
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_9">
<item>
- <widget class="QLabel" name="label_9">
+ <widget class="QLabel" name="label_10">
<property name="font">
<font>
<weight>75</weight>
View
2  src/QGLView.h
@@ -40,7 +40,7 @@ class QGLView : public QGLWidget, public GLView
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);
View
2  src/openscad.cc
@@ -551,7 +551,7 @@ int gui(vector<string> &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();
Please sign in to comment.
Something went wrong with that request. Please try again.