Merge branch 'master' into features/effectnode
This commit is contained in:
commit
e49da68ab3
|
@ -32,12 +32,12 @@ But so far only Linux is actively tested.
|
|||
It might support all versions Qt >= 5.15, but you can rely on:
|
||||
|
||||
- Qt 5.15
|
||||
- current long term supported ( LTS ) version of Qt
|
||||
- current long term supported ( LTS ) version of Qt ( at the moment Qt 6.5.x )
|
||||
- current version of Qt
|
||||
|
||||
On debian bullseye these packages need to be installed: `build-essential
|
||||
qt-qmake qtbase5-dev qtbase5-private-dev qtdeclarative5-dev
|
||||
qtdeclarative5-private-dev libqt5svg5-dev`.
|
||||
On debian bullseye these packages need to be installed for Qt5: `build-essential
|
||||
qtbase5-dev qtbase5-private-dev qtdeclarative5-dev qtdeclarative5-private-dev libqt5svg5-dev`.
|
||||
For Qt6 you need the corresponding ones.
|
||||
|
||||
> Optional: When enabling the `hunspell` feature the following package needs to be installed: `libhunspell-dev`
|
||||
|
||||
|
|
|
@ -210,7 +210,12 @@ namespace
|
|||
|
||||
QSize Renderer::textureSize() const
|
||||
{
|
||||
return m_fbo ? m_fbo->size() : QSize();
|
||||
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
|
||||
if ( m_fbo ) return m_fbo->size();
|
||||
#else
|
||||
if( m_rt.rt ) return m_rt.rt->pixelSize();
|
||||
#endif
|
||||
return QSize();
|
||||
}
|
||||
|
||||
void Renderer::render()
|
||||
|
|
Loading…
Reference in New Issue