diff options
| author | Marius Kintel <marius@kintel.net> | 2013-09-13 05:06:17 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-09-13 05:06:17 (GMT) |
| commit | ead8749e99238c18a3d7bb903f98bb7bca6a7685 (patch) | |
| tree | baa054dc0bd236e11a0ad29c41f092193a52245d /src/mainwin.cc | |
| parent | 233406230281d8fefe24902fea52d916dfb3d88e (diff) | |
| parent | f82ff8272b9698e7c572d6c67a5b69bf26896933 (diff) | |
Merge pull request #476 from openscad/testfixes
Testfixes
Diffstat (limited to 'src/mainwin.cc')
| -rw-r--r-- | src/mainwin.cc | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc index 3d50d6f..783772c 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -101,10 +101,6 @@ #endif // ENABLE_CGAL -#ifndef OPENCSG_VERSION_STRING -#define OPENCSG_VERSION_STRING "unknown, <1.3.2" -#endif - #include "boosty.h" extern QString examplesdir; @@ -1828,34 +1824,16 @@ MainWindow::helpManual() QDesktopServices::openUrl(QUrl("http://www.openscad.org/documentation.html")); } -#define STRINGIFY(x) #x -#define TOSTRING(x) STRINGIFY(x) void MainWindow::helpLibrary() { - QString libinfo; - libinfo.sprintf("Boost version: %s\n" - "Eigen version: %d.%d.%d\n" - "CGAL version: %s\n" - "OpenCSG version: %s\n" - "Qt version: %s\n\n", - BOOST_LIB_VERSION, - EIGEN_WORLD_VERSION, EIGEN_MAJOR_VERSION, EIGEN_MINOR_VERSION, - TOSTRING(CGAL_VERSION), - OPENCSG_VERSION_STRING, - qVersion()); - -#if defined( __MINGW64__ ) - libinfo += QString("Compiled for MingW64\n\n"); -#elif defined( __MINGW32__ ) - libinfo += QString("Compiled for MingW32\n\n"); -#endif - + QString info( PlatformUtils::info().c_str() ); + info += QString( qglview->getRendererInfo().c_str() ); if (!this->openglbox) { - this->openglbox = new QMessageBox(QMessageBox::Information, - "OpenGL Info", "OpenSCAD Detailed Library Info ", + this->openglbox = new QMessageBox(QMessageBox::Information, + "OpenGL Info", "OpenSCAD Detailed Library and Build Information", QMessageBox::Ok, this); } - this->openglbox->setDetailedText(libinfo + QString(qglview->getRendererInfo().c_str())); + this->openglbox->setDetailedText( info ); this->openglbox->show(); } |