diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-28 05:52:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-28 05:52:39 (GMT) |
| commit | b40eff542e12ce903a8e25dcd4a6d963fdec99d3 (patch) | |
| tree | d18ed8d749e8e35910e5bdbb4ff5d1874e03b616 /src/gui/widgets/qmainwindowlayout_mac.mm | |
| parent | 692e12b928fa94209a38afc7693be3469bc57039 (diff) | |
| parent | a4538a2532582f4bb1b6e85ed1e125f9c68bb251 (diff) | |
| download | Qt-b40eff542e12ce903a8e25dcd4a6d963fdec99d3.zip Qt-b40eff542e12ce903a8e25dcd4a6d963fdec99d3.tar.gz Qt-b40eff542e12ce903a8e25dcd4a6d963fdec99d3.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
don't falsely complain about mismatched codecfortr
Fix QSettings default paths not being initialized when setPath() is called
add directories with sources to list of project roots
add -codecfortr option
sanitize lupdate's behavior regarding SUBDIRS projects
absorb cmdline tests into "good" structure
add ability to set working dir for test
support multiple output files
fix printing output from failed command
unshare pro post-processing code
complain if both sources and projects are given on the cmdline
still complain if only ts files where specified on the cmdline
do not sort the TS files
fix bogus warning message
Diffstat (limited to 'src/gui/widgets/qmainwindowlayout_mac.mm')
0 files changed, 0 insertions, 0 deletions