AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a06cb56dde
qt5base-lts/qmake
History
Gunnar Sletta b62bd0584a Merge branch 'refactor' 
Conflicts:
	mkspecs/qws/linux-lsb-g++/qmake.conf
	src/gui/image/qpixmap_mac.cpp
	src/gui/painting/qpaintengine_x11.cpp
	src/gui/painting/qtessellator.cpp
	src/gui/text/qfontengine_qws.cpp
	src/gui/text/qfontengine_x11.cpp
	src/gui/widgets/qlinecontrol.cpp
	src/opengl/qgl.h
	src/opengl/qgl_x11egl.cpp
	src/plugins/plugins.pro

Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
2011-09-13 08:54:45 +02:00
..
generators Merge branch 'refactor' 2011-09-13 08:54:45 +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 qsystemlibrary needs no special treatment 2011-09-12 16:03:47 +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 find qt.conf more reliably 2011-09-12 18:25:54 +02:00
option.h Remove references to QT_INSTALL_DEMOS & DemosPath. 2011-07-06 13:29:44 +02:00
project.cpp Make qmake load default_pre.prf for each project, like default_post.prf 2011-07-21 20:40:51 +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