diff --git a/GCV-3.6.1-T4.qt52/src/GCV.pro b/GCV-3.6.1-T4.qt52/src/GCV.pro
index 3e3d95c..a4de49c 100644
--- a/GCV-3.6.1-T4.qt52/src/GCV.pro
+++ b/GCV-3.6.1-T4.qt52/src/GCV.pro
@@ -1,164 +1,165 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2012-02-13 T17:48:40
-#
-# Rename by LETARTARE July 28, 2014
-# GCV.pro
-#
-#-------------------------------------------------
-
-TEMPLATE = app
-TARGET = GrblController
-
-DEFINES = QT_NO_DEBUG
-
-QT += core gui
-
-unix {
- QT += widgets
-}
-
-# LETARTARE June 12, 2014
-contains(QT_VERSION, "^5.*") {
- QT *= widgets printsupport
-}
-
-# LETARTARE July 28, 2014
-# DESTDIR = bin
-
-CONFIG(debug, debug|release) {
- # TARGET =
- DESTDIR = bin/debug
- OBJECTS_DIR = build/debug/obj
- MOC_DIR = build/debug/moc
- RCC_DIR = build/debug/rcc
- UI_DIR = build/debug/ui
-}
-else {
- # TARGET =
- DESTDIR = bin
- OBJECTS_DIR = build/release/obj
- MOC_DIR = build/release/moc
- RCC_DIR = build/release/rcc
- UI_DIR = build/release/ui
-}
-
-# QGlViewer
-QT += xml opengl
-INCLUDEPATH += QGLViewer QGLWidget
-# srichy November 17, 2014
-unix {
- !macx {
- LIBS += -lGLU
- LIBS += -lQGLViewer
- }
- else
- {
- LIBS *= -framework QGLViewer
- }
-}
-else {
- LIBS += -lQGlViewer2
-}
-
-
-HEADER += visu3D/Point3D.h visu3D/Line3D.h visu3D/Arc3D.h visu3D/Tools3D.h visu3D/Box3D.h
-SOURCES += visu3D/Point3D.cpp visu3D/Line3D.cpp visu3D/Arc3D.cpp visu3D/Tools3D.cpp visu3D/Box3D.cpp
-
-
-# Translations
- TRANSLATIONS += trlocale/GrblController_xx.ts
- TRANSLATIONS += trlocale/GrblController_fr.ts
-
-include(QextSerialPort/qextserialport.pri)
-include(log4qt/log4qt.pri)
-
-SOURCES += main.cpp\
- mainwindow.cpp \
- rs232.cpp \
- options.cpp \
- grbldialog.cpp \
- about.cpp \
- gcode.cpp \
- timer.cpp \
- atomicintbool.cpp \
- coord3d.cpp \
- renderarea.cpp \
- positem.cpp \
- renderitemlist.cpp \
- lineitem.cpp \
- itemtobase.cpp \
- arcitem.cpp \
- pointitem.cpp \
- controlparams.cpp \
- visu3D/viewer3D.cpp
-
-HEADERS += mainwindow.h \
- rs232.h \
- options.h \
- grbldialog.h \
- definitions.h \
- about.h \
- images.rcc \
- gcode.h \
- timer.h \
- atomicintbool.h \
- coord3d.h \
- log4qtdef.h \
- renderarea.h \
- positem.h \
- renderitemlist.h \
- lineitem.h \
- itemtobase.h \
- arcitem.h \
- pointitem.h \
- termiosext.h \
- controlparams.h \
- version.h \
- visu3D/viewer3D.h
-
-FORMS += forms/mainwindow.ui \
- forms/options.ui \
- forms/grbldialog.ui \
- forms/about.ui
-
-RESOURCES += GrblController.qrc
-
-RC_FILE = grbl.rc
-
-OTHER_FILES += \
- android/AndroidManifest.xml \
- android/res/drawable/icon.png \
- android/res/drawable/logo.png \
- android/res/drawable-hdpi/icon.png \
- android/res/drawable-ldpi/icon.png \
- android/res/drawable-mdpi/icon.png \
- android/res/layout/splash.xml \
- android/res/values/libs.xml \
- android/res/values/strings.xml \
- android/res/values-de/strings.xml \
- android/res/values-el/strings.xml \
- android/res/values-es/strings.xml \
- android/res/values-et/strings.xml \
- android/res/values-fa/strings.xml \
- android/res/values-fr/strings.xml \
- android/res/values-id/strings.xml \
- android/res/values-it/strings.xml \
- android/res/values-ja/strings.xml \
- android/res/values-ms/strings.xml \
- android/res/values-nb/strings.xml \
- android/res/values-nl/strings.xml \
- android/res/values-pl/strings.xml \
- android/res/values-pt-rBR/strings.xml \
- android/res/values-ro/strings.xml \
- android/res/values-rs/strings.xml \
- android/res/values-ru/strings.xml \
- android/res/values-zh-rCN/strings.xml \
- android/res/values-zh-rTW/strings.xml \
- android/src/org/kde/necessitas/ministro/IMinistro.aidl \
- android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \
- android/src/org/kde/necessitas/origo/QtActivity.java \
- android/src/org/kde/necessitas/origo/QtApplication.java \
- android/version.xml
-
-
+#-------------------------------------------------
+#
+# Project created by QtCreator 2012-02-13 T17:48:40
+#
+# Rename by LETARTARE July 28, 2014
+# GCV.pro
+#
+#-------------------------------------------------
+
+TEMPLATE = app
+TARGET = GrblController
+
+DEFINES = QT_NO_DEBUG
+
+QT += core gui
+
+unix {
+ QT += widgets
+}
+
+# LETARTARE June 12, 2014
+contains(QT_VERSION, "^5.*") {
+ QT *= widgets printsupport
+}
+
+# LETARTARE July 28, 2014
+# DESTDIR = bin
+
+CONFIG(debug, debug|release) {
+ # TARGET =
+ DESTDIR = bin/debug
+ OBJECTS_DIR = build/debug/obj
+ MOC_DIR = build/debug/moc
+ RCC_DIR = build/debug/rcc
+ UI_DIR = build/debug/ui
+}
+else {
+ # TARGET =
+ DESTDIR = bin
+ OBJECTS_DIR = build/release/obj
+ MOC_DIR = build/release/moc
+ RCC_DIR = build/release/rcc
+ UI_DIR = build/release/ui
+}
+
+# QGlViewer
+QT += xml opengl
+#INCLUDEPATH += QGLViewer QGLWidget
+# srichy November 17, 2014
+unix {
+ !macx {
+ LIBS += -lGLU
+ LIBS += -lQGLViewer
+ }
+
+ linux-g++ {
+ LIBS += -lqglviewer2
+ message(Linux)
+ }
+}
+else {
+ LIBS += -lQGlViewer2
+}
+
+
+HEADER += visu3D/Point3D.h visu3D/Line3D.h visu3D/Arc3D.h visu3D/Tools3D.h visu3D/Box3D.h
+SOURCES += visu3D/Point3D.cpp visu3D/Line3D.cpp visu3D/Arc3D.cpp visu3D/Tools3D.cpp visu3D/Box3D.cpp
+
+
+# Translations
+ TRANSLATIONS += trlocale/GrblController_xx.ts
+ TRANSLATIONS += trlocale/GrblController_fr.ts
+
+include(QextSerialPort/qextserialport.pri)
+include(log4qt/log4qt.pri)
+
+SOURCES += main.cpp\
+ mainwindow.cpp \
+ rs232.cpp \
+ options.cpp \
+ grbldialog.cpp \
+ about.cpp \
+ gcode.cpp \
+ timer.cpp \
+ atomicintbool.cpp \
+ coord3d.cpp \
+ renderarea.cpp \
+ positem.cpp \
+ renderitemlist.cpp \
+ lineitem.cpp \
+ itemtobase.cpp \
+ arcitem.cpp \
+ pointitem.cpp \
+ controlparams.cpp \
+ visu3D/viewer3D.cpp
+
+HEADERS += mainwindow.h \
+ rs232.h \
+ options.h \
+ grbldialog.h \
+ definitions.h \
+ about.h \
+ images.rcc \
+ gcode.h \
+ timer.h \
+ atomicintbool.h \
+ coord3d.h \
+ log4qtdef.h \
+ renderarea.h \
+ positem.h \
+ renderitemlist.h \
+ lineitem.h \
+ itemtobase.h \
+ arcitem.h \
+ pointitem.h \
+ termiosext.h \
+ controlparams.h \
+ version.h \
+ visu3D/viewer3D.h
+
+FORMS += forms/mainwindow.ui \
+ forms/options.ui \
+ forms/grbldialog.ui \
+ forms/about.ui
+
+RESOURCES += GrblController.qrc
+
+RC_FILE = grbl.rc
+
+OTHER_FILES += \
+ android/AndroidManifest.xml \
+ android/res/drawable/icon.png \
+ android/res/drawable/logo.png \
+ android/res/drawable-hdpi/icon.png \
+ android/res/drawable-ldpi/icon.png \
+ android/res/drawable-mdpi/icon.png \
+ android/res/layout/splash.xml \
+ android/res/values/libs.xml \
+ android/res/values/strings.xml \
+ android/res/values-de/strings.xml \
+ android/res/values-el/strings.xml \
+ android/res/values-es/strings.xml \
+ android/res/values-et/strings.xml \
+ android/res/values-fa/strings.xml \
+ android/res/values-fr/strings.xml \
+ android/res/values-id/strings.xml \
+ android/res/values-it/strings.xml \
+ android/res/values-ja/strings.xml \
+ android/res/values-ms/strings.xml \
+ android/res/values-nb/strings.xml \
+ android/res/values-nl/strings.xml \
+ android/res/values-pl/strings.xml \
+ android/res/values-pt-rBR/strings.xml \
+ android/res/values-ro/strings.xml \
+ android/res/values-rs/strings.xml \
+ android/res/values-ru/strings.xml \
+ android/res/values-zh-rCN/strings.xml \
+ android/res/values-zh-rTW/strings.xml \
+ android/src/org/kde/necessitas/ministro/IMinistro.aidl \
+ android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \
+ android/src/org/kde/necessitas/origo/QtActivity.java \
+ android/src/org/kde/necessitas/origo/QtApplication.java \
+ android/version.xml
+
+
diff --git a/GCV-3.6.1-T4.qt52/src/forms/mainwindow.ui b/GCV-3.6.1-T4.qt52/src/forms/mainwindow.ui
index 0b2b690..c2fd2c5 100644
--- a/GCV-3.6.1-T4.qt52/src/forms/mainwindow.ui
+++ b/GCV-3.6.1-T4.qt52/src/forms/mainwindow.ui
@@ -1246,7 +1246,7 @@
false
-
+
3
diff --git a/GCV-3.6.1-T4.qt52/src/log4qt/helpers/factory.h b/GCV-3.6.1-T4.qt52/src/log4qt/helpers/factory.h
index dfe4bfa..b75b4b3 100644
--- a/GCV-3.6.1-T4.qt52/src/log4qt/helpers/factory.h
+++ b/GCV-3.6.1-T4.qt52/src/log4qt/helpers/factory.h
@@ -29,7 +29,7 @@
/******************************************************************************
* Dependencies
******************************************************************************/
-
+#include
#include
#include
#include
diff --git a/GCV-3.6.1-T4.qt52/src/visu3D/box3D.cpp b/GCV-3.6.1-T4.qt52/src/visu3D/Box3D.cpp
similarity index 94%
rename from GCV-3.6.1-T4.qt52/src/visu3D/box3D.cpp
rename to GCV-3.6.1-T4.qt52/src/visu3D/Box3D.cpp
index 3edc867..25e6e78 100644
--- a/GCV-3.6.1-T4.qt52/src/visu3D/box3D.cpp
+++ b/GCV-3.6.1-T4.qt52/src/visu3D/Box3D.cpp
@@ -7,7 +7,7 @@
* License: GPL
**************************************************************/
-#include "box3D.h"
+#include "Box3D.h"
#include
Box3D::Box3D(const QVector3D p1, const QVector3D p2, bool mm1, QColor c)
diff --git a/GCV-3.6.1-T4.qt52/src/visu3D/box3D.h b/GCV-3.6.1-T4.qt52/src/visu3D/Box3D.h
similarity index 100%
rename from GCV-3.6.1-T4.qt52/src/visu3D/box3D.h
rename to GCV-3.6.1-T4.qt52/src/visu3D/Box3D.h
diff --git a/GCV-3.6.1-T4.qt52/src/visu3D/viewer3D.cpp b/GCV-3.6.1-T4.qt52/src/visu3D/viewer3D.cpp
index bd3fa27..79879d3 100644
--- a/GCV-3.6.1-T4.qt52/src/visu3D/viewer3D.cpp
+++ b/GCV-3.6.1-T4.qt52/src/visu3D/viewer3D.cpp
@@ -9,10 +9,10 @@
#include "viewer3D.h"
#include
-#include "point3D.h"
-#include "line3D.h"
-#include "arc3d.h"
-#include "box3D.h"
+#include "Point3D.h"
+#include "Line3D.h"
+#include "Arc3D.h"
+#include "Box3D.h"
#include "version.h"
// Constructor must call the base class constructor.