18a3f6169b
Conflicts: demos/demos.pro demos/embedded/digiflip/digiflip.pro examples/examples.pro examples/graphicsview/embeddeddialogs/embeddeddialogs.pro src/gui/kernel/qplatformglcontext_qpa.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745 |
||
---|---|---|
.. | ||
colorswatch.cpp | ||
colorswatch.h | ||
main.cpp | ||
mainwindow.cpp | ||
mainwindow.h | ||
mainwindow.pro | ||
mainwindow.qrc | ||
qt.png | ||
titlebarCenter.png | ||
titlebarLeft.png | ||
titlebarRight.png | ||
toolbar.cpp | ||
toolbar.h |