Go to file
Samuel Rødal 92c998afb6 Merge remote branch 'gerrit/master' into refactor
Conflicts:
	src/gui/kernel/qapplication_x11.cpp
	src/gui/widgets/qlinecontrol.cpp
	src/gui/widgets/qlinecontrol_p.h
	src/gui/widgets/qtabwidget.h

Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736
2011-08-03 11:03:22 +02:00
bin Merge remote branch 'gerrit/master' into refactor 2011-08-03 11:03:22 +02:00
config.profiles Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
config.tests Merge remote branch 'gerrit/master' into refactor 2011-07-06 14:08:02 +02:00
dist Changed QLibrary::resolve() to return a function pointer. 2011-07-25 12:58:23 +02:00
doc/src Merge remote branch 'gerrit/master' into refactor 2011-08-03 11:03:22 +02:00
examples Merge remote branch 'gerrit/master' into refactor 2011-08-03 11:03:22 +02:00
lib Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
mkspecs Merge remote branch 'gerrit/master' into refactor 2011-08-03 11:03:22 +02:00
qmake Merge remote branch 'gerrit/master' into refactor 2011-08-03 11:03:22 +02:00
src Merge remote branch 'gerrit/master' into refactor 2011-08-03 11:03:22 +02:00
tests Merge remote branch 'gerrit/master' into refactor 2011-08-03 11:03:22 +02:00
tools Merge remote branch 'gerrit/master' into refactor 2011-08-03 11:03:22 +02:00
util drop an obsolete QChar::NoCategory enum value 2011-07-13 13:31:13 +02:00
.gitattributes Added .tag file with Git revision. 2011-05-03 16:23:49 +02:00
.gitignore Add QT_xxx_VERSION macros for each library in qtbase 2011-05-10 15:15:15 +02:00
.tag Added .tag file with Git revision. 2011-05-03 16:23:49 +02:00
configure Merge remote branch 'gerrit/master' into refactor 2011-08-03 11:03:22 +02:00
configure.exe New configure.exe binary: Qt 5 with QT3_SUPPORT removed. 2011-05-31 11:11:43 +02:00
header.BSD Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
header.FDL Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
header.LGPL Update licenseheader text in source files for qtbase Qt module 2011-05-24 12:34:08 +03:00
header.LGPL-ONLY Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
INSTALL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LGPL_EXCEPTION.txt Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.FDL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.LGPL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.PREVIEW.COMMERCIAL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
qtbase.pro Try to make sure the config test script is installed. 2011-07-26 13:40:07 +02:00
sync.profile Merge remote branch 'gerrit/master' into refactor 2011-07-12 12:52:22 +02:00