qt5base-lts/examples/embedded
Liang Qi 6b2535ea15 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	examples/widgets/graphicsview/boxes/scene.h
	src/corelib/Qt5CoreMacros.cmake
	src/corelib/Qt6CoreMacros.cmake
	src/network/ssl/qsslsocket.cpp
	src/network/ssl/qsslsocket.h
	src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
	src/testlib/CMakeLists.txt
	src/testlib/.prev_CMakeLists.txt
	tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp

Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152
2020-02-13 18:31:40 +01:00
..
digiflip Regenerate examples 2020-02-04 18:50:39 +00:00
flickable Regenerate examples 2020-02-04 18:50:39 +00:00
flightinfo Merge remote-tracking branch 'origin/5.15' into dev 2020-02-13 18:31:40 +01:00
lightmaps Regenerate examples 2020-02-04 18:50:39 +00:00
raycasting Regenerate examples 2020-02-04 18:50:39 +00:00
styleexample Regenerate examples 2020-02-04 18:50:39 +00:00
CMakeLists.txt CMake: Add more examples 2019-03-26 13:03:01 +00:00
embedded.pro Examples: Remove remains of wince 2017-07-14 17:30:51 +00:00