AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0584424d5c
qt5base-lts/src
History
Jørgen Lind 18a3f6169b Merge remote-tracking branch 'base/master' into refactor 
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
2011-06-27 12:27:54 +02:00
..
3rdparty Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
corelib Merge remote-tracking branch 'base/master' into refactor 2011-06-27 12:27:54 +02:00
dbus Add a function that returns the D-Bus local machine ID 2011-06-23 18:26:28 +02:00
gui Merge remote-tracking branch 'base/master' into refactor 2011-06-27 12:27:54 +02:00
modules QtPlatformSupport: A helper library for platform plugins 2011-06-10 09:46:56 +02:00
network IPv4 + IPv6 dual stack sockets 2011-06-22 11:01:00 +02:00
opengl Get declarative and wayland EGL backend working for Qt compositor. 2011-06-23 15:40:42 +02:00
platformsupport Compile. 2011-06-23 11:15:13 +02:00
plugins Merge remote-tracking branch 'base/master' into refactor 2011-06-27 12:27:54 +02:00
s60installs update def files 2011-05-11 16:40:09 +02:00
s60main Moved common module profiles to be feature profiles. 2011-06-05 14:47:14 +02:00
sql Merge remote-tracking branch 'base/master' into refactor 2011-06-10 13:09:57 +02:00
testlib Merge remote-tracking branch 'base/master' into refactor 2011-06-27 12:27:54 +02:00
tools Merge remote-tracking branch 'base/master' into refactor 2011-06-27 12:27:54 +02:00
uitools Merge remote-tracking branch 'base/master' into refactor 2011-06-10 13:09:57 +02:00
widgets Merge remote-tracking branch 'base/master' into refactor 2011-06-27 12:27:54 +02:00
winmain Moved common module profiles to be feature profiles. 2011-06-05 14:47:14 +02:00
xml Fix modules to load(qt_module) first 2011-06-08 21:04:48 +02:00
qbase.pri Moved common module profiles to be feature profiles. 2011-06-05 14:47:14 +02:00
qt_install.pri Moved common module profiles to be feature profiles. 2011-06-05 14:47:14 +02:00
qt_targets.pri Moved common module profiles to be feature profiles. 2011-06-05 14:47:14 +02:00
src.pro QtPlatformSupport: A helper library for platform plugins 2011-06-10 09:46:56 +02:00