Jørgen Lind 00ef07fe96 Merge remote-tracking branch 'base/master' into refactor ... Conflicts: src/gui/embedded/qmousepc_qws.cpp src/gui/embedded/qwslock.cpp src/plugins/decorations/default/default.pro src/plugins/decorations/styled/styled.pro src/plugins/decorations/windows/windows.pro src/plugins/gfxdrivers/ahi/ahi.pro src/plugins/gfxdrivers/directfb/directfb.pro src/plugins/gfxdrivers/eglnullws/eglnullws.pro src/plugins/gfxdrivers/linuxfb/linuxfb.pro src/plugins/gfxdrivers/qvfb/qvfb.pro src/plugins/gfxdrivers/transformed/transformed.pro src/plugins/gfxdrivers/vnc/vnc.pro src/plugins/graphicssystems/meego/meego.pro src/plugins/graphicssystems/opengl/opengl.pro src/plugins/graphicssystems/openvg/openvg.pro src/plugins/graphicssystems/shivavg/shivavg.pro src/plugins/graphicssystems/trace/trace.pro src/plugins/kbddrivers/linuxinput/linuxinput.pro src/plugins/mousedrivers/linuxtp/linuxtp.pro src/plugins/mousedrivers/pc/pc.pro src/plugins/mousedrivers/tslib/tslib.pro src/plugins/platforms/minimal/minimal.pro tests/auto/qerrormessage/qerrormessage.pro		2011-06-01 15:34:58 +02:00
..
aix-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
aix-g++-64	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
aix-xlc	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
aix-xlc-64	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
common	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
cygwin-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
darwin-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
features	Merge remote-tracking branch 'base/master' into refactor	2011-06-01 15:34:58 +02:00
freebsd-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
freebsd-g++34	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
freebsd-g++40	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
freebsd-icc	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
hpux-acc	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
hpux-acc-64	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
hpux-acc-o64	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
hpux-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
hpux-g++-64	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
hpuxi-acc-32	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
hpuxi-acc-64	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
hpuxi-g++-64	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
hurd-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
irix-cc	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
irix-cc-64	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
irix-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
irix-g++-64	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
linux-cxx	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
linux-ecc-64	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
linux-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
linux-g++-32	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
linux-g++-64	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
linux-g++-maemo	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
linux-icc	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
linux-icc-32	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
linux-icc-64	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
linux-kcc	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
linux-llvm	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
linux-lsb-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
linux-pgcc	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
lynxos-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
macx-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
macx-g++40	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
macx-g++42	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
macx-icc	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
macx-llvm	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
macx-pbuilder	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
macx-xcode	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
macx-xlc	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
modules	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
netbsd-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
openbsd-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
sco-cc	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
sco-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
solaris-cc	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
solaris-cc-64	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
solaris-cc-64-stlport	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
solaris-cc-stlport	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
solaris-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
solaris-g++-64	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
symbian-abld	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
symbian-armcc	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
symbian-gcce	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
symbian-sbsv2	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
tru64-cxx	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
tru64-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
unixware-cc	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
unixware-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
unsupported	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
win32-borland	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
win32-g++	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
win32-icc	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
win32-msvc2003	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
win32-msvc2005	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
win32-msvc2008	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
win32-msvc2010	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wince50standard-armv4i-msvc2005	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wince50standard-armv4i-msvc2008	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wince50standard-mipsii-msvc2005	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wince50standard-mipsii-msvc2008	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wince50standard-mipsiv-msvc2005	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wince50standard-mipsiv-msvc2008	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wince50standard-sh4-msvc2005	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wince50standard-sh4-msvc2008	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wince50standard-x86-msvc2005	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wince50standard-x86-msvc2008	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wince60standard-armv4i-msvc2005	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wince60standard-x86-msvc2005	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wincewm50pocket-msvc2005	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wincewm50pocket-msvc2008	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wincewm50smart-msvc2005	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wincewm50smart-msvc2008	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wincewm60professional-msvc2005	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wincewm60professional-msvc2008	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wincewm60standard-msvc2005	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wincewm60standard-msvc2008	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wincewm65professional-msvc2005	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
wincewm65professional-msvc2008	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00