1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove calls to setlocale in QtOpenGL cube example.

Browse Source 
This is causing compilation errors on some Windows CE
configurations:

mainwidget.cpp(130) : error C3861: 'setlocale': identifier not found
mainwidget.cpp(149) : error C3861: 'setlocale': identifier not found

Change-Id: Ie863cd7c9c53cfef4074dabffe157d9068654a1c
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
This commit is contained in:
Friedemann Kleint 2014-03-12 09:34:36 +01:00 committed by The Qt Project
parent fbaa6d3ca6
commit 23a79b9119
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/opengl/cube/mainwidget.cpp
View File

@ -43,7 +43,6 @@
#include <QMouseEvent> #include <QMouseEvent>
#include <math.h> #include <math.h>
#include <locale.h>
MainWidget::MainWidget(QWidget *parent) : MainWidget::MainWidget(QWidget *parent) :
QGLWidget(parent), QGLWidget(parent),
@ -126,9 +125,6 @@ void MainWidget::initializeGL()
//! [3] //! [3]
void MainWidget::initShaders() void MainWidget::initShaders()
{ {
// Override system locale until shaders are compiled
setlocale(LC_NUMERIC, "C");
// Compile vertex shader // Compile vertex shader
if (!program.addShaderFromSourceFile(QGLShader::Vertex, ":/vshader.glsl")) if (!program.addShaderFromSourceFile(QGLShader::Vertex, ":/vshader.glsl"))
close(); close();
@ -144,9 +140,6 @@ void MainWidget::initShaders()
// Bind shader pipeline for use // Bind shader pipeline for use
if (!program.bind()) if (!program.bind())
close(); close();
// Restore system locale
setlocale(LC_ALL, "");
} }
//! [3] //! [3]