Commit graph

6131 commits

Author SHA1 Message Date
Marius Kintel
de7550fdfd Added testcase for #1803 2016-10-08 12:38:32 +02:00
Marius Kintel
5893b88db2 Merge branch 'master' of github.com:openscad/openscad 2016-10-07 15:35:59 +02:00
Marius Kintel
06c2847b58 Bumped OpenCSG to 1.4.2 2016-10-07 15:35:46 +02:00
Marius Kintel
836f9ff8de Merge pull request #1817 from openscad/wininfo_fix_2016
Wininfo fix 2016 for issue #1800
2016-10-07 13:03:49 +02:00
Don Bright
42d3003c39 typo fix 2016-10-06 21:35:59 -05:00
Don Bright
c2df8a6f42 fix previous commit (show fmt.str() ) 2016-10-06 21:33:28 -05:00
Torsten Paul
569c11fbde Don't rely on return status from brew ls --versions.
This seems to have changed with the Taravis macOS environment upgrade
to travis-ci-osx10.11-xcode7.3.
2016-10-07 03:52:22 +02:00
Don Bright
3531feb6ae in which i remove a semi colon because it makes the compiler unhappy 2016-10-06 20:22:57 -05:00
Don Bright
933344b869 forgot to add winmanifest.xml , simplify sysinfo string 2016-10-06 19:18:18 -05:00
Torsten Paul
aa5289b59b Merge pull request #1819 from openscad/qt4-compile-fix
Remove clearButtonEnabled property introduced with #1767.
2016-10-07 01:45:07 +02:00
Torsten Paul
5d692b95fc Remove clearButtonEnabled property introduced with #1767.
This breaks compilation with Qt4 as the property was added in Qt5.2.
2016-10-07 01:30:21 +02:00
Marius Kintel
9592df2bbd Merge pull request #1767 from onewhl/issue962
Redesign find and replace panel
2016-10-07 01:04:01 +02:00
Marius Kintel
7a17e50982 Merge pull request #1772 from vesim987/master
fix: Qt moved QT_VERSION_STR to qconfig.h
2016-10-07 00:46:28 +02:00
don bright
5bfb66d0e5 detect windows 10 w manifest. cleanup stuff related to old versions (XP etc) 2016-10-05 00:35:45 -05:00
don bright
0eadea0b71 second attempt to add manifest 2016-10-04 23:08:56 -05:00
don bright
f4dc1bfcce attempt to add windows (TM) manifest file 2016-10-04 22:30:49 -05:00
don bright
1da3a2daa1 basic refactor so the sysinfo() code is legible 2016-10-04 22:21:29 -05:00
Marius Kintel
7e0935d02c sync 2016-10-01 01:32:42 +02:00
Marius Kintel
d75cf8c234 Merge pull request #1804 from clothbot/patch-4
File names changed to QScintilla_gpl-2.9.2.tar.gz
2016-09-23 00:25:03 -04:00
Andrew Plumb
40b6e5007d File names changed to QScintilla_gpl-2.9.2.tar.gz
Looks like the project decided to change QScintilla-gpl-* to QScintilla_gpl-* in version 2.9.2 and 2.9.3.
2016-09-22 18:04:10 -04:00
Marius Kintel
7020e60e99 Merge pull request #1799 from openscad/png-export-exit-status
Indicate failure to create offscreen buffer for PNG export with non-zero exit status.
2016-09-21 23:49:23 -04:00
Marius Kintel
4a0f3b2ad5 Make sure new assignments get a location 2016-09-19 16:17:49 -04:00
Marius Kintel
9331e48c19 Added ASTNode::setLocation() 2016-09-19 16:11:47 -04:00
Torsten Paul
fbf6db2d12 Latest libxml2 from MXE needs to link against liblzma. 2016-09-18 19:31:29 +02:00
Torsten Paul
c854662766 Indicate failure to create offscreen buffer for PNG export with non-zero exit status. 2016-09-18 19:21:32 +02:00
Torsten Paul
a5e4def690 Add libxml2. 2016-09-17 23:22:04 +02:00
Marius Kintel
2bd8a2ed14 Merge pull request #1789 from senttech/l10n-pl
Polish translation
2016-09-16 00:51:04 -04:00
Marius Kintel
3531d9ad21 Merge pull request #1794 from SlesarevIlya/master
Fix Russian translation
2016-09-16 00:44:07 -04:00
don bright
a2e658e709 use qt4 on kde neon linux distro, issue #1792 2016-09-15 03:50:24 -05:00
don bright
7b43c83abb Merge branch 'master' of github.com:openscad/openscad 2016-09-14 22:27:23 -05:00
don bright
b2b3f8ef29 Merge pull request #1790 from yeus/master
dependency helper scripted adapted for KDE Neon distribution
2016-09-14 22:26:30 -05:00
don bright
e65a2b2bd6 dont look at /etc/fedora-release if it doesnt exist (prevent error) 2016-09-14 22:21:31 -05:00
Thomas.Meschede
f0b34548ec dependency helper scripted adapted for KDE Neon distribution 2016-09-14 10:06:21 +02:00
SlesarevIlya
0a2ed5baf4 Merge branch 'master' of git://github.com/openscad/openscad 2016-09-14 01:19:04 +03:00
SlesarevIlya
e580c8499f Fix Russian translation 2016-09-14 01:05:56 +03:00
MarPiRK
7a5ddc96a5 Polish translation
Also updated pot file.
2016-09-13 23:39:17 +02:00
Marius Kintel
4a0ac7b2fa Updated to OpenCSG 1.4.1 2016-09-11 14:40:52 -04:00
don bright
ba26a08d1b fix build on ubuntu 16 by upgrading version of gmp + cgal 2016-09-09 01:27:12 +00:00
don bright
31211c6b7f improve QtOpenGLWidget gl format reporting 2016-09-04 18:37:35 -05:00
don bright
2d5504bcc6 allow build with system supplied fontconfig,libxml2 even if we have
other dependencies built (this makes it easier for example to build
against just our own custom opencsg or just our own custom boost version)
2016-09-04 16:05:49 -05:00
don bright
fb30128f6c try to fix Xvfb PID detection for Travis CI ubuntu 14 2016-09-04 00:55:18 -05:00
don bright
1852230ade repair indentation to original state 2016-09-02 22:07:33 -05:00
don bright
67170488ef fix segfault crash when DISPLAY is empty (getenv returned null pointer) 2016-09-02 22:05:01 -05:00
Marius Kintel
77782d24f6 Added note about script running to fast to catch the VFB PID 2016-09-01 23:50:00 -04:00
Marius Kintel
a47e303b0d Minor fix: Moved isListComprehension() out of the Expression API 2016-09-01 23:24:27 -04:00
Marius Kintel
acb5b6fc03 Merge branch 'master' of github.com:openscad/openscad 2016-09-01 22:37:38 -04:00
Marius Kintel
f82bb52b17 Use proper qscintilla2 package. Don't unlink boost. Fixes #1784 2016-09-01 22:37:35 -04:00
Marius Kintel
4272a97d76 Merge pull request #1782 from openscad/ppc64buildfix2016
Ppc64buildfix2016
2016-09-01 22:33:57 -04:00
don bright
733562b1ee fix build on newer fedora 2016-08-25 23:50:58 +00:00
Don Bright
9dd6ddf9b9 prevent font direction bug by upgrading freetype version 2016-08-25 01:19:16 -04:00