diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:10:15 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:10:15 +0100 |
| commit | 3b5c0bc0780f1749fed7c07bd8b691400a0282b7 (patch) | |
| tree | 1022f5553ad5a0aca9b5f3b49ca38a01c2329d20 /examples/opengl/cube/mainwidget.cpp | |
| parent | c79918733a194ebbe5a2fe1617c884659f3e4b9f (diff) | |
| parent | 21f1738a94fc8544ece04b3b1ee03a11986fe59b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/image/qjpeghandler.cpp
Change-Id: I9db3acea7d5c82f5da679c8eaeb29431136665f0
Diffstat (limited to 'examples/opengl/cube/mainwidget.cpp')
| -rw-r--r-- | examples/opengl/cube/mainwidget.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/examples/opengl/cube/mainwidget.cpp b/examples/opengl/cube/mainwidget.cpp index 8c87de6736..5c1cd28b54 100644 --- a/examples/opengl/cube/mainwidget.cpp +++ b/examples/opengl/cube/mainwidget.cpp @@ -43,7 +43,6 @@ #include <QMouseEvent> #include <math.h> -#include <locale.h> MainWidget::MainWidget(QWidget *parent) : QGLWidget(parent), @@ -126,9 +125,6 @@ void MainWidget::initializeGL() //! [3] void MainWidget::initShaders() { - // Override system locale until shaders are compiled - setlocale(LC_NUMERIC, "C"); - // Compile vertex shader if (!program.addShaderFromSourceFile(QGLShader::Vertex, ":/vshader.glsl")) close(); @@ -144,9 +140,6 @@ void MainWidget::initShaders() // Bind shader pipeline for use if (!program.bind()) close(); - - // Restore system locale - setlocale(LC_ALL, ""); } //! [3] |