summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Unbreak build on Mac OS X 10.5 after b0b80d9e8d11c38dTor Arne Vestbø2011-03-041-1/+1
| | | | Reviewed-by: Fabien Freling
* Don't treat Objective-C property references as l-valuesTor Arne Vestbø2011-03-021-4/+6
| | | | | | | Fixes Clang compile issue as Clang is stricter than gcc on this. See http://llvm.org/bugs/show_bug.cgi?id=8770 Reviewed-by: Fabien Freling <fabien.freling@nokia.com>
* qdoc3: Fix compilation with -no-stlhjk2011-03-021-0/+2
| | | | Reviewed-by: David Boddie
* don't add extraneous empty command linesOswald Buddenhagen2011-03-013-3/+3
| | | | Reviewed-by: mariusSO
* make the $$quote() function less prominentOswald Buddenhagen2011-03-012-19/+9
| | | | | | | it does something else than people expect it to do, so just "hide" it (by not referring to it anywhere except in its own doc). Reviewed-by: mariusSO
* minor cleanup of the QMAKE_POST_LINK command line constructionOswald Buddenhagen2011-03-011-2/+2
| | | | | | | don't over-$$quote(), consistently use a single string instead of a string list Reviewed-by: mariusSO
* silence qmake warning about unbalanced parenthesesOswald Buddenhagen2011-03-011-1/+1
| | | | this is stupid, but i don't feel like fixing qmake now
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-2875-118/+2986
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits) fix autotest on windows (again) fix autotest on windows Ammend last INTEGRITY fix Fix qmake build on Windows fix test for QtLighthouse add test for suppressing warnings in moc Ammend INTEGRITY fixes Store property editor's column positions in settings add gsm to connectable bearer for networkmanager. Fix license headers add missing include Silence GHS compiler Run on INTEGRITY Fix compilation on INTEGRITY Do not link with libm on INTEGRITY Add a "-nn" option to moc Add Documentation about INTEGRITY RTOS List the INTEGRITY drivers as well Use TCP_LOCALSOCKET on INTEGRITY Compile for systems without mmap ...
| * fix autotest on windows (again)Harald Fernengel2011-02-281-1/+1
| |
| * fix autotest on windowsHarald Fernengel2011-02-271-0/+7
| |
| * Ammend last INTEGRITY fixHarald Fernengel2011-02-243-3/+14
| | | | | | | | Also build gbuild.cpp on windows
| * Fix qmake build on WindowsHarald Fernengel2011-02-243-3/+3
| | | | | | | | The INTEGRITY changes only modified the Unix makefile
| * fix test for QtLighthouseHarald Fernengel2011-02-231-1/+1
| |
| * add test for suppressing warnings in mocHarald Fernengel2011-02-231-2/+117
| |
| * Ammend INTEGRITY fixesHarald Fernengel2011-02-231-3/+4
| | | | | | | | Unbreak normal QWS build again
| * Store property editor's column positions in settingsJarek Kobus2011-02-231-0/+4
| | | | | | | | | | RevBy: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task: QTBUG-15497
| * add gsm to connectable bearer for networkmanager.Lorn Potter2011-02-221-0/+5
| | | | | | | | Reviewed-by: trustme
| * Fix license headersHarald Fernengel2011-02-2210-188/+279
| |
| * add missing includeRolland Dudemaine2011-02-221-0/+1
| | | | | | | | | | Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * Silence GHS compilerRolland Dudemaine2011-02-221-0/+4
| | | | | | | | | | | | | | Remove some warnings for the GHS compiler Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * Run on INTEGRITYRolland Dudemaine2011-02-221-1/+10
| | | | | | | | | | | | | | Fix a runtime error on INTEGRITY Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * Fix compilation on INTEGRITYRolland Dudemaine2011-02-224-35/+35
| | | | | | | | | | | | | | "Value" and "Object" are reserved words on INTEGRITY Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * Do not link with libm on INTEGRITYRolland Dudemaine2011-02-223-3/+3
| | | | | | | | | | Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * Add a "-nn" option to mocRolland Dudemaine2011-02-223-4/+16
| | | | | | | | | | | | | | | | Demote "No relevant classes found" warnings to "notes". "-nn" can be used to silence notes in order to reduce noise on embedded builds Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * Add Documentation about INTEGRITY RTOSRolland Dudemaine2011-02-221-0/+109
| | | | | | | | | | Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * List the INTEGRITY drivers as wellRolland Dudemaine2011-02-221-0/+5
| | | | | | | | | | | | | | If the INTEGRITY drivers are in the source tree, show them as available Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * Use TCP_LOCALSOCKET on INTEGRITYRolland Dudemaine2011-02-224-2/+13
| | | | | | | | | | | | | | Use TCP localsockets on INTEGRITY, and other small INTEGRITY fixes Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * Compile for systems without mmapRolland Dudemaine2011-02-221-10/+40
| | | | | | | | | | | | | | Unbreak compilation for systems like INTEGRITY that don't have file mmap. Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * Various INTEGRITY fixesRolland Dudemaine2011-02-227-28/+37
| | | | | | | | | | | | | | | | | | | | Small-ish compilation fixes. Note that "Value" is a reserved word on INTEGRITY, so we need to use the correct namespace. Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * INTEGRITY screen, mouse and kbd driversRolland Dudemaine2011-02-2211-1/+1113
| | | | | | | | | | | | | | | | Add INTEGRITY RTOS framebuffer, mouse and keyboard drivers that use native INTEGRITY APIs. Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * Various INTEGRITY fixesRolland Dudemaine2011-02-2212-9/+62
| | | | | | | | | | | | | | | | Some smaller adaptation for missing POSIX calls and some build system tweaks for the INTEGRITY RTOS Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * Atomic operations support for INTEGRITY RTOSRolland Dudemaine2011-02-224-1/+292
| | | | | | | | | | | | | | Added atomic operations using INTEGRITY native APIs Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * Compile with MinGW on WindowsRolland Dudemaine2011-02-221-1/+1
| | | | | | | | | | | | | | Use the correct OSVersion struct Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * Add support for the INTEGRITY RTOS build systemRolland Dudemaine2011-02-2214-14/+1007
| | | | | | | | | | | | | | Adds mkspecs and a qmake generator for Green Hills .gpj files Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-02-285-34/+35
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Prevent stroking zero length lines in qstroker.cpp Make the animation driver private API Stop using XLFD as fontconfig matching fallback OpenGL Framebuffer Format
| * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-02-253-22/+34
| |\ \ | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Prevent stroking zero length lines in qstroker.cpp Make the animation driver private API
| | * | Prevent stroking zero length lines in qstroker.cppSamuel Rødal2011-02-251-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If several consecutive points are the same, we should just skip until we get a unique point. This prevents stroking artifacts in the miter join for example. Task-number: QTBUG-5331 Reviewed-by: Kim
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamGunnar Sletta2011-02-2575-219/+817
| | |\ \
| | * | | Make the animation driver private APIGunnar Sletta2011-02-252-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | We are not entirely comfortable with the API yet, so it needs a bit more maturity
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-02-2575-219/+817
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (41 commits) Unbreak compilation with ICC when in C++98 mode. Removing tabs from 7388fcb83592a90aace054314e0c3e7e7a94fdae changeset Fix QNetworkConfigurationManager crash due to null private pointer. Add Intel Compiler's C++0x feature support macros Remove the assignment-move operator that was a bad copy-paste Fix "array subscript out of bounds" warning with GCC 4.5 in QtOpenGL Fix warning about unused parameter Fix warning about parentheses about && in || Fix warning about QLatin1String::operator==(const char*) deprecated Fix silly warnings about initialising in the wrong order Fix the move semantics in QSharedDataPointer and QExplicitSDP Fix compilation: Q_UNUSED takes exactly one variable that is unused Designer: Check for 0-spacing when loading grid settings. Added test case for corrupt pixel count in XPM image. QImage crash when invalid XPM is read. Fix an issue with removing rows in a table model. Changed the localized vendor name for Qt SIS packages to "Nokia" Fix compilation error with ARMv5 atomics when T is a const value. Fix parallel builds RGBA32 -> RGB565 dithering in Meego Graphicssystem, ...
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-02-252-12/+1
| | |\ \ \ | | | |/ /
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-02-241-11/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Stop using XLFD as fontconfig matching fallback
| | * | | Stop using XLFD as fontconfig matching fallbackJiang Jiang2011-02-241-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following our kill list of moving away from XLFD, and since the result of XLFD is unreliable and problematic (it requires maintainence of fonts.dir/fonts.alias which people no longer care about), remove the usage of XLFD as a fallback for fontconfig matching. Task-number: QTBUG-17455 Reviewed-by: Eskil
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-02-241-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: OpenGL Framebuffer Format
| | * | | OpenGL Framebuffer FormatGerhard Roethlin2011-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenGL's framebuffer contains data with premultiplied alpha images, so QImage::Format_ARGB32_Premultiplied should be used instead of QImage::Format_ARGB32 to store it. Alternatively, the color values could be divided by the alpha to restore the original color. Merge-request: 1102 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-02-281-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Fixed wrong reference to bld.inf in the package_definition.xml file
| * | | | | Fixed wrong reference to bld.inf in the package_definition.xml fileEckhart Koppen2011-02-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed extra path component Reviewed-by: Hannu Niinimaki
* | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-02-263-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Always prepend drive letter to $$EPOCROOT in Windows Symbian builds Add files deployed using qmake_emulator_deployment.flm to 'what' list QRuntimeWindowSystem: Track window size properly
| * \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-253-0/+7
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-252-0/+6
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Always prepend drive letter to $$EPOCROOT in Windows Symbian builds Add files deployed using qmake_emulator_deployment.flm to 'what' list
generated by cgit v0.12 at 2024-12-29 09:38:33 (GMT)