AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
310519d6d1
qt5base-lts/qmake
History
Samuel Rødal 2371147354 Merge remote branch 'gerrit/master' into refactor 
Conflicts:
	src/gui/image/qicon.cpp
	src/gui/image/qicon.h
	src/gui/image/qicon_p.h
	src/gui/text/qfontdatabase.cpp
	src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp
	src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
	src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
	sync.profile

Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
2011-07-12 12:52:22 +02:00
..
generators Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
cachekeys.h Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
CHANGES Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
main.cpp Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
Makefile.unix Move private headers into versioned subdirectory 2011-05-02 15:30:08 +02:00
Makefile.win32 Move private headers into versioned subdirectory 2011-05-02 15:30:08 +02:00
Makefile.win32-g++ Move private headers into versioned subdirectory 2011-05-02 15:30:08 +02:00
Makefile.win32-g++-sh Move private headers into versioned subdirectory 2011-05-02 15:30:08 +02:00
meta.cpp Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
meta.h Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
option.cpp Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
option.h Remove references to QT_INSTALL_DEMOS & DemosPath. 2011-07-06 13:29:44 +02:00
project.cpp fix $$resolve_depends() 2011-07-11 18:58:41 +02:00
project.h inline resoveDepends() 2011-07-11 18:58:41 +02:00
property.cpp Remove references to QT_INSTALL_DEMOS & DemosPath. 2011-07-06 13:29:44 +02:00
property.h Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
qmake_pch.h Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
qmake.pri Merge remote branch 'gerrit/master' into refactor 2011-07-12 12:52:22 +02:00
qmake.pro make the non-bootstrapped build work again 2011-07-11 15:50:59 +02:00