summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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>
* Unbreak compilation with ICC when in C++98 mode.Thiago Macieira2011-02-221-9/+11
| | | | | | | | ICC 11 used __GXX_EXPERIMENTAL_CPP0X__ (i.e., different spelling than GCC). ICC 12 seems to have no macro indicating that C++0x mode is enabled. Needs clarification from Intel.
* Removing tabs from 7388fcb83592a90aace054314e0c3e7e7a94fdae changesetCristiano di Flora2011-02-221-1/+1
|
* Fix QNetworkConfigurationManager crash due to null private pointer.Cristiano di Flora2011-02-221-12/+5
| | | | | Reviewed-by: Aaron McCarthy Task-Number: QTBUG-17305
* Add Intel Compiler's C++0x feature support macrosThiago Macieira2011-02-211-1/+16
|
* Remove the assignment-move operator that was a bad copy-pasteThiago Macieira2011-02-211-2/+0
| | | | Reviewed-By: Olivier Goffart
* Fix "array subscript out of bounds" warning with GCC 4.5 in QtOpenGLThiago Macieira2011-02-212-6/+6
| | | | | | | | | | | | | | | | | | If you have: qreal m[2][2]; const qreal *constData() { return m[0]; } And somewhere else: const qreal *data = matrix.constData(); for (int i = 0; i < 2 * 2; ++i) tmp = data[i]; Then GCC "sees through" the data pointer to know that the type is actually a qreal[2] and will complain when you access data[2] and data[3] in the example above. It seems to be satisfied with this return *m, even though it's exactly the same thing. This is probably fragile.
* Fix warning about unused parameterThiago Macieira2011-02-211-0/+1
|
* Fix warning about parentheses about && in ||Thiago Macieira2011-02-211-1/+1
|
* Fix warning about QLatin1String::operator==(const char*) deprecatedThiago Macieira2011-02-211-2/+2
| | | | Use qstrcmp instead.
* Fix silly warnings about initialising in the wrong orderThiago Macieira2011-02-211-4/+4
|
* Fix the move semantics in QSharedDataPointer and QExplicitSDPThiago Macieira2011-02-211-1/+5
| | | | Reviewed-by: Olivier Goffart
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-181-1/+1
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compilation error with ARMv5 atomics when T is a const value.
| * Fix compilation error with ARMv5 atomics when T is a const value.Thiago Macieira2011-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Error was: ../../include/QtCore/../../src/corelib/arch/qatomic_armv5.h:301: error: invalid conversion from 'const void*' to 'void*' faba550d704312a29d9485bcaaa506331f102301 introduced the fix to 4.7, but since the file was renamed in 4.8, the merge didn't apply. The conflict resolution in 91efdcae was incomplete. Reviewed-by: Harald Fernengel
* | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-02-187-119/+59
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: 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" RGBA32 -> RGB565 dithering in Meego Graphicssystem, Remove sqlite3.sis from qt.sis.
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-187-102/+59
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-183-4/+4
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: 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.
| | | * | QImage crash when invalid XPM is read.Niklas Kurkisuo2011-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sanity check for cpp, which would otherwise lead to a segfault later in the code. Task-number: QTBUG-17254 Merge-request: 1080 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | | * | Fix an issue with removing rows in a table model.Michael Goddard2011-02-182-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tables with nulls in a row were not being deleted properly in some cases. Made sure the responsible function no longer has default parameters so this doesn't happen again. Change-Id: I479121172d5ac172ca49da78638b9353d7a67548 Task-number: QTBUG-16007, QTBUG-15979 Reviewed-by: Charles Yin
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-183-3/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Changed the localized vendor name for Qt SIS packages to "Nokia"
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Eckhart Koppen2011-02-171-17/+0
| | | |\ \ \
| | | * | | | Changed the localized vendor name for Qt SIS packages to "Nokia"Eckhart Koppen2011-02-173-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previously used name "Nokia, Qt" was not usable for Nokia Content Signing, which only allows "Nokia" as the visible vendor name. The unique vendor ID remains as "Nokia, Qt" Reviewed-by: TrustMe
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-171-95/+52
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: RGBA32 -> RGB565 dithering in Meego Graphicssystem,
| | | * | | | RGBA32 -> RGB565 dithering in Meego Graphicssystem,Tero Tiittanen2011-02-171-95/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dithering in QMeeGoPixmapData::imageToEGLSharedImage is now done using Ordered Dithering, not anymore Floyd-Steinberg dithering. This provides better overall results. Fixes: NB#208927 - X dithering looks better than meego graphicssystem one Merge-request: 1079 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-171-17/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-171-17/+0
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove sqlite3.sis from qt.sis.
| | | * | | | Remove sqlite3.sis from qt.sis.Miikka Heikkinen2011-02-171-17/+0
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nokia Content Signing doesn't like embedded sis packages, so remove the embedded sqlite3.sis from qt.sis. It must now be installed separately just like Open C packages. Task-number: QTBUG-17399 Reviewed-by: axis
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-02-171-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Fix parallel builds
| * | | | | Fix parallel buildsJoão Abecasis2011-02-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-1723-45/+180
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf mkspecs/symbian-gcce/qmake.conf src/corelib/global/qnamespace.h src/corelib/global/qnamespace.qdoc src/plugins/plugins.pro tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-163-1/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Made Q_ASSERT meaningful again Introduce new flag for splitview support in Symbian
| | * | | Made Q_ASSERT meaningful againEckhart Koppen2011-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | m_bytesPadding is an unsigned integer, assert would never have been triggered. Reviewed-by: TrustMe
| | * | | Introduce new flag for splitview support in SymbianSami Merila2011-02-162-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce new flag for splitview support as internal to Qt 4.7.2. The actual implementation will be delivered to Qt 4.7.3. Task-number: QTBUG-16572 Reviewed-by: Janne Koskinen
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-152-5/+33
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix for clipping failure in OpenVG paint engine.
| | * | | Fix for clipping failure in OpenVG paint engine.Jani Hautakangas2011-02-152-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenVG implementation for Broadcom chip has limited scissor rect count to 32. Because of that Qt OpenVG paint engine fails to clip correctly if clip rect count exceeds 32. This patch makes Qt OpenVG paint engine to use mask instead of scissors in such cases. Task-number: QTBUG-16932 Reviewed-by: Jason Barron
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-151-0/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Use QML notation for documenting TextInput::accepted() signal. Document the TextInput accepted() signal.
| | * | | | Use QML notation for documenting TextInput::accepted() signal.Andrew den Exter2011-02-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the name onAccepted() and refer to it as a handler rather than a signal. Change-Id: Ibd4144aa809e6d9db136187a07e9a660afa5df1b
| | * | | | Document the TextInput accepted() signal.Andrew den Exter2011-02-151-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30a36ba2724c9641e9cfe5ceafa651728907ef63
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-152-4/+18
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix inheritance of widget input contexts.
generated by cgit v0.12 at 2025-02-12 15:43:45 (GMT)