Skip to content

Commit 3f65bbf

Browse files
committed
test for #184
Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
1 parent 0415321 commit 3f65bbf

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

openhantek/src/OH_BUILD.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// Do not edit, will be re-created at each commit!
2-
#define OH_BUILD "20210423 - commit 892"
2+
#define OH_BUILD "20210424 - commit 893"

openhantek/src/glscope.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@ GlScope *GlScope::createZoomed( DsoSettingsScope *scope, DsoSettingsView *view,
3939

4040

4141
void GlScope::useQSurfaceFormat( QSurfaceFormat::RenderableType t ) {
42-
QCoreApplication::setAttribute( Qt::AA_ShareOpenGLContexts, true );
42+
// QCoreApplication::setAttribute( Qt::AA_ShareOpenGLContexts, true ); // too late here, set early in main()
4343

4444
// Prefer full desktop OpenGL without fixed pipeline
4545
QSurfaceFormat format;
46-
// TODO: check from time to time if warning has gone, comment next line for now
46+
// from time to time the next line can give a warning
4747
format.setSamples( 4 ); // antialiasing gives warning with some HW, Qt & OpenGL versions.
4848
format.setProfile( QSurfaceFormat::CoreProfile );
4949
if ( t == QSurfaceFormat::OpenGLES ) {
50-
format.setVersion( 2, 0 );
50+
// format.setVersion( 2, 0 );
5151
format.setRenderableType( QSurfaceFormat::OpenGLES );
5252
QCoreApplication::setAttribute( Qt::AA_UseOpenGLES, true );
5353
} else {
54-
format.setVersion( 3, 2 );
54+
// format.setVersion( 3, 2 );
5555
format.setRenderableType( QSurfaceFormat::OpenGL );
5656
}
5757
QSurfaceFormat::setDefaultFormat( format );

0 commit comments

Comments
 (0)