some temporary workarounds for MSVC problems

This commit is contained in:
Uwe Rathmann 2018-09-23 17:25:32 +02:00
parent a3c224c865
commit a5b3a70e7d
2 changed files with 17 additions and 0 deletions

View File

@ -92,6 +92,13 @@ namespace
bool fixup()
{
#ifdef _MSC_VER
/*
We can't call hasAcceptableInput with MSVC
and need to find our own code instead TODO ...
*/
return true;
#else
auto d = QQuickTextInputPrivate::get( this );
// QQuickTextInputPrivate::checkIsValid ???
@ -102,6 +109,7 @@ namespace
isAcceptable = d->fixup();
return isAcceptable;
#endif
}
void updateColors();

View File

@ -78,6 +78,14 @@ static uint qskTextureRaster(
const QRect& rect, Qt::AspectRatioMode scalingMode,
const QskGraphic& graphic, const QskColorFilter& filter )
{
#ifdef _MSC_VER
/*
We can't access the internals of QOpenGLTexture with MSVC
and have to replace the code below by doing OpenGL calls directly.
Until this is not done we disable using the raster
*/
return qskTextureFBO( rect, scalingMode, graphic, filter );
#else
QImage image( rect.size(), QImage::Format_RGBA8888_Premultiplied );
image.fill( Qt::transparent );
@ -98,6 +106,7 @@ static uint qskTextureRaster(
uint textureId = 0;
qSwap( texture.d_func()->textureId, textureId );
return textureId;
#endif
}
QskGraphicTextureFactory::QskGraphicTextureFactory()