AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile fix for QT_NO_OPENGL

Browse Source 
Change-Id: I5ea962b0d77198945a4f87ad821d3c3dcffd260c
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
This commit is contained in:
Paul Olav Tvete 2014-02-24 12:26:59 +01:00 committed by The Qt Project
parent 921bfe58c2
commit 328a282ebd
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/widgets/kernel/qwidgetbackingstore.cpp
View File

@ -78,9 +78,11 @@ void QWidgetBackingStore::qt_flush(QWidget *widget, const QRegion &region, QBack
{
#ifdef QT_NO_OPENGL
Q_UNUSED(widgetTextures);
Q_ASSERT(!region.isEmpty());
#else
Q_ASSERT(!region.isEmpty() || (widgetTextures && widgetTextures->count()));
#endif
Q_ASSERT(widget);
Q_ASSERT(!region.isEmpty() || (widgetTextures && widgetTextures->count()));
Q_ASSERT(backingStore);
Q_ASSERT(tlw);
@ -749,8 +751,9 @@ QWidgetBackingStore::~QWidgetBackingStore()
for (int c = 0; c < dirtyWidgets.size(); ++c) {
resetWidget(dirtyWidgets.at(c));
}
#ifndef QT_NO_OPENGL
delete dirtyOnScreenWidgets;
#endif
dirtyOnScreenWidgets = 0;
}
@ -959,7 +962,6 @@ static void findTextureWidgetsRecursively(QWidget *tlw, QWidget *widget, QPlatfo
findTextureWidgetsRecursively(tlw, w, widgetTextures);
}
}
#endif
QPlatformTextureListWatcher::QPlatformTextureListWatcher(QWidgetBackingStore *backingStore)
: m_locked(false),
@ -979,6 +981,7 @@ void QPlatformTextureListWatcher::onLockStatusChanged(bool locked)
if (!locked)
m_backingStore->sync();
}
#endif // QT_NO_OPENGL
/*!
Synchronizes the backing store, i.e. dirty areas are repainted and flushed.
@ -1003,6 +1006,7 @@ void QWidgetBackingStore::sync()
return;
}
#ifndef QT_NO_OPENGL
if (textureListWatcher && !textureListWatcher->isLocked()) {
textureListWatcher->deleteLater();
textureListWatcher = 0;
@ -1013,6 +1017,7 @@ void QWidgetBackingStore::sync()
textureListWatcher->watch(widgetTextures);
return;
}
#endif
doSync();
}

3
src/widgets/kernel/qwidgetbackingstore_p.h
View File

@ -61,6 +61,7 @@
QT_BEGIN_NAMESPACE
class QPlatformTextureList;
class QPlatformTextureListWatcher;
class QWidgetBackingStore;
struct BeginPaintInfo {
@ -70,6 +71,7 @@ struct BeginPaintInfo {
uint backingStoreRecreated : 1;
};
#ifndef QT_NO_OPENGL
class QPlatformTextureListWatcher : public QObject
{
Q_OBJECT
@ -86,6 +88,7 @@ private:
bool m_locked;
QWidgetBackingStore *m_backingStore;
};
#endif
class Q_AUTOTEST_EXPORT QWidgetBackingStore
{