summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Geometry Shader support in QGLShaderProgramGunnar Sletta2010-02-014-1/+228
|
* Fixed compile of QTriangulator on Solaris.Kim Motoyoshi Kalland2010-01-261-5/+7
| | | | Reviewed-by: Trond
* Fix compile on MSVC 2003. ARRAYSIZE macro doesn't exit.Alexis Menard2010-01-261-1/+1
| | | | Reviewed-by:Jan-Arve
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-267-75/+73
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-257-75/+73
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-257-75/+73
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-229-77/+75
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-229-77/+75
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-229-77/+75
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | | | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-229-77/+75
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | | | | | | * Fixed compile for wincewm60standard-msvc2008 (attempt 2)Rohan McGovern2010-01-221-3/+2
| | | | | | | |
| | | | | | | * Fixed compile for wincewm60standard-msvc2008.Rohan McGovern2010-01-221-1/+2
| | | | | | | |
| | | | | | | * Fixed compile.Rohan McGovern2010-01-221-1/+1
| | | | | | | |
| | | | | | | * Fixed compile for wincewm60standard-msvc2008.Rohan McGovern2010-01-221-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes partial revert of b4dd6ff29bc921ec81b4fd67ed44830e4d697d1d
| | | | | | | * Fixed compile when Qt is configured with -no-webkitRohan McGovern2010-01-221-2/+2
| | | | | | | |
| | | | | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-229-106/+127
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | | | | | | | * build fix for mingwThierry Bastian2010-01-181-1/+9
| | | | | | | | |
| | | | | | | | * Build fix for MSVC2005 and older SDKThierry Bastian2010-01-183-31/+47
| | | | | | | | |
| | | | | | | | * QStyleSheetStyle: Fixed some text croped when having padding with native border.Olivier Goffart2010-01-082-1/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native border width need to be taken into account in QRenderRule::boxRect() Task-number: QTBUG-6855 Reviewed-by: Benjamin Poulain (cherry picked from commit 6e90192b599cee9b903177a0978198326f667613)
| | | | | | | | * Merge remote branch 'origin/master'Olivier Goffart2010-01-08451-5848/+18836
| | | | | | | | |\
| | | | | | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Bill King2009-12-162-44/+14
| | | | | | | | |\ \
| | | | | | | | | * | Character spacing when drawing a QPicture to a high DPI device.Trond Kjernåsen2009-11-131-40/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drawing some text into a QPicture, and then drawing that QPicture to e.g. a QPrinter, would make the character spacing all wrong. The old approach that tried to fix this adjusted the DPI of the font that was used, so that the text size would be correct. It seems this is not enough, since it will lay out the text in the default resolution, and then scale that up, which may/may not introduce errors. Task-number: QTBUG-4974, 256481 Reviewed-by: Kim
| | | | | | | | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGunnar Sletta2009-11-1347-829/+1364
| | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf
| | | | | | | | | * \ \ Merge branch '4.6' of ..\qt-graphics-4.6Gunnar Sletta2009-11-13964-29397/+42871
| | | | | | | | | |\ \ \
| | | | | | | | | * \ \ \ Merge branch '4.6' of c:\dev\qt-graphics-4.6Gunnar Sletta2009-11-042234-57109/+96333
| | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| | | | | | | | * | | | | | Remove obsolete code for unsupported platformsBill King2009-12-162-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was apparently put in for OSX10.3. ODBC2 is over 10 years old now, and even microsoft doesn't support any fashion to link to the ansi versions of the functions. Remove the #define so that we don't have to support it any more. Reviewed-by: Justin McPherson
* | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Pulse Build System2010-01-263-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1: Carbon: fix build breakage on carbon Remove statusbaritem on Mac OSX doc: added part of Andy's update. Fix the tablet device recognition on Windows Fix S60 input method not showing up in editable QGraphicsTextItems
| * | | | | | | | | | | | | Carbon: fix build breakage on carbonRichard Moe Gustavsen2010-01-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just forgot an ifdef...
| * | | | | | | | | | | | | Merge branch 'master' into staging-1-masterPaul Olav Tvete2010-01-259172-26796/+52974
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/getting-started/installation.qdoc
* | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Pulse Build System2010-01-2515-49/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed the host detection in qmake profiles. Improving parts of commit 2d8d855d. qmake: add Linux host support to Symbian generator Fixed indentation. Add Linux host support to Symbian mkspecs. Linux support for platform specific commands in .pro files. Add createpackage.bat equivalent for Unix systems. Make all Symbian #includes lower case. mkspecs: fix warning when calling qmake Fix portability problems in bin/createpackage.pl.
| * | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Pulse Build System2010-01-2215-49/+102
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed the host detection in qmake profiles. Improving parts of commit 2d8d855d. qmake: add Linux host support to Symbian generator Fixed indentation. Add Linux host support to Symbian mkspecs. Linux support for platform specific commands in .pro files. Add createpackage.bat equivalent for Unix systems. Make all Symbian #includes lower case. mkspecs: fix warning when calling qmake Fix portability problems in bin/createpackage.pl.
| | * | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Pulse Build System2010-01-2215-49/+102
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed the host detection in qmake profiles. Improving parts of commit 2d8d855d. qmake: add Linux host support to Symbian generator Fixed indentation. Add Linux host support to Symbian mkspecs. Linux support for platform specific commands in .pro files. Add createpackage.bat equivalent for Unix systems. Make all Symbian #includes lower case. mkspecs: fix warning when calling qmake Fix portability problems in bin/createpackage.pl.
| | | * | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Pulse Build System2010-01-2215-49/+102
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed the host detection in qmake profiles. Improving parts of commit 2d8d855d. qmake: add Linux host support to Symbian generator Fixed indentation. Add Linux host support to Symbian mkspecs. Linux support for platform specific commands in .pro files. Add createpackage.bat equivalent for Unix systems. Make all Symbian #includes lower case. mkspecs: fix warning when calling qmake Fix portability problems in bin/createpackage.pl.
| | | | * | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Pulse Build System2010-01-2215-49/+102
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed the host detection in qmake profiles. Improving parts of commit 2d8d855d. qmake: add Linux host support to Symbian generator Fixed indentation. Add Linux host support to Symbian mkspecs. Linux support for platform specific commands in .pro files. Add createpackage.bat equivalent for Unix systems. Make all Symbian #includes lower case. mkspecs: fix warning when calling qmake Fix portability problems in bin/createpackage.pl.
| | | | | * | | | | | | | | Fixed the host detection in qmake profiles.axis2010-01-053-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous tests were checking the target platform, but we need to check the host. RevBy: Trust me
| | | | | * | | | | | | | | Merge branch 'merge-request-1601' into master-s60axis2010-01-0516-51/+104
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/createpackage.pl mkspecs/features/symbian/application_icon.prf qmake/generators/symbian/symmake_abld.cpp src/gui/text/qfontdatabase_s60.cpp src/s60main/s60main.pro
| | | | | | * | | | | | | | | Improving parts of commit 2d8d855d.axis2009-11-171-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It breaks Symbian on Windows, so instead use an approach that works on all platforms.
| | | | | | * | | | | | | | | qmake: add Linux host support to Symbian generatorAnderson Lizardo2009-11-174-23/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| | | | | | * | | | | | | | | Fixed indentation.axis2009-11-171-6/+6
| | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | Add Linux host support to Symbian mkspecs.Anderson Lizardo2009-11-172-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| | | | | | * | | | | | | | | Linux support for platform specific commands in .pro files.Anderson Lizardo2009-10-282-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| | | | | | * | | | | | | | | Add createpackage.bat equivalent for Unix systems.Anderson Lizardo2009-10-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| | | | | | * | | | | | | | | Make all Symbian #includes lower case.Anderson Lizardo2009-10-237-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| | | | | | * | | | | | | | | mkspecs: fix warning when calling qmakeAnderson Lizardo2009-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| | | | | | * | | | | | | | | Fix portability problems in bin/createpackage.pl.Anderson Lizardo2009-10-231-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use File::Spec functions to manipulate path components. * Keep $targetplatform lower case for case sensitive systems. Signed-off-by: axis <qt-info@nokia.com>
* | | | | | | | | | | | | | | build fix for phonon on winceThierry Bastian2010-01-252-2/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merged qplatformdefs.h for AIXJoão Abecasis2010-01-225-228/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't think the differences warranted having to maintain 3 slightly differing copies. "Old" locations changed to a forwarding header to the merged one. Differences and how they were resolved in the merged file: - comment on a workaround for a potential issue when using g++ => comment kept - #ifdef's for xlc-64 had been simplified, because it is only supported on AIX 4.3 and above => versioned #ifdefs should still work on 64-bit platforms, so that was preferred; comment left for future reference - use of different condition in #if clause: (_XOPEN_SOURCE-0 >= 500) => verbosity preferred, since it is probably a workaround for a preprocessor or #define bug. Reviewed-by: Thiago Macieira
* | | | | | | | | | | | | | | Dropping windows #define from qplatformheaders for *nix platforms.João Abecasis2010-01-2220-40/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT_STATBUF4TSTAT was meant for the windows-specific _tstat function, taking a _TCHAR* path argument. Reviewed-by: Thiago Macieira
* | | | | | | | | | | | | | | Refactor common POSIX support out of individual qplatformdefs.hJoão Abecasis2010-01-2250-1799/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POSIX header incorporates previously refactored X/Open LFS extensions. Reviewed-by: Thiago Macieira
* | | | | | | | | | | | | | | Refactor common C89 support out of individual qplatformdefs.hJoão Abecasis2010-01-2227-179/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira
generated by cgit v0.12 at 2024-12-29 09:02:05 (GMT)