Changeset View
Changeset View
Standalone View
Standalone View
shell/desktopview.cpp
Show First 20 Lines • Show All 60 Lines • ▼ Show 20 Line(s) | 44 | { | |||
---|---|---|---|---|---|
61 | 61 | | |||
62 | KActivities::Controller *m_activityController = new KActivities::Controller(this); | 62 | KActivities::Controller *m_activityController = new KActivities::Controller(this); | ||
63 | 63 | | |||
64 | QObject::connect(m_activityController, &KActivities::Controller::activityAdded, | 64 | QObject::connect(m_activityController, &KActivities::Controller::activityAdded, | ||
65 | this, &DesktopView::candidateContainmentsChanged); | 65 | this, &DesktopView::candidateContainmentsChanged); | ||
66 | QObject::connect(m_activityController, &KActivities::Controller::activityRemoved, | 66 | QObject::connect(m_activityController, &KActivities::Controller::activityRemoved, | ||
67 | this, &DesktopView::candidateContainmentsChanged); | 67 | this, &DesktopView::candidateContainmentsChanged); | ||
68 | 68 | | |||
69 | if (QQuickWindow::sceneGraphBackend() != QLatin1String("software")) { | 69 | if (rendererInterface()->graphicsApi() != QSGRendererInterface::Software) { | ||
70 | connect(this, &DesktopView::sceneGraphInitialized, this, | 70 | connect(this, &DesktopView::sceneGraphInitialized, this, | ||
71 | [this, corona]() { | 71 | [this, corona]() { | ||
72 | // check whether the GL Context supports OpenGL | 72 | // check whether the GL Context supports OpenGL | ||
graesslin: This looks like too much debug or like a need of qcdebug | |||||
73 | // Note: hasOpenGLShaderPrograms is broken, see QTBUG--39730 | 73 | // Note: hasOpenGLShaderPrograms is broken, see QTBUG--39730 | ||
74 | if (!QOpenGLShaderProgram::hasOpenGLShaderPrograms(openglContext())) { | 74 | if (!QOpenGLShaderProgram::hasOpenGLShaderPrograms(openglContext())) { | ||
75 | qWarning() << "GLSL not available, Plasma won't be functional"; | 75 | qWarning() << "GLSL not available, Plasma won't be functional"; | ||
76 | QMetaObject::invokeMethod(corona, "showOpenGLNotCompatibleWarning", Qt::QueuedConnection); | 76 | QMetaObject::invokeMethod(corona, "glInitialisationFailed", Qt::QueuedConnection); | ||
77 | } | 77 | } | ||
78 | }, Qt::DirectConnection); | 78 | }, Qt::DirectConnection); | ||
79 | } | 79 | } | ||
80 | } | 80 | } | ||
81 | 81 | | |||
82 | DesktopView::~DesktopView() | 82 | DesktopView::~DesktopView() | ||
83 | { | 83 | { | ||
84 | } | 84 | } | ||
▲ Show 20 Lines • Show All 258 Lines • Show Last 20 Lines |
This looks like too much debug or like a need of qcdebug