Commit 6ef5734a authored by David Edmundson's avatar David Edmundson
Browse files

Fix QtQuickRenderSettings from loading

Currently the firstCall guard is broken and the code is never run.

BUG: 455575


(cherry picked from commit 97a2a802)
parent a8b493c7
Pipeline #235358 passed with stage
in 1 minute and 20 seconds
......@@ -51,11 +51,24 @@ static bool checkBackend(QOpenGLContext &checkContext)
void initializeRendererSessions()
{
static bool firstCall = true; // Otherwise this gets called twice, see QTBUG-54479
// This is loaded via Q_COREAPP_STARTUP_FUNCTION
// Due to a quirk this gets called twice, see QTBUG-54479
// The order of events is:
// Q*Application constructor starts
// We load the QPA
// We load the QPT (The first arguably incorrect invocation triggers)
// QPA gets initalised
// QCoreApplication constructor ends
// Second (correct) invocation
// it's important that we run after the QPA is initalised'
static bool firstCall = true;
if (firstCall) {
firstCall = false;
return;
}
firstCall = false;
PlasmaQtQuickSettings::RendererSettings s;
QOpenGLContext checkContext;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment