summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-24874-19632/+39788
|\ | | | | | | | | | | Conflicts: src/network/access/qnetworkreplyimpl.cpp tests/auto/moc/tst_moc.cpp
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-02-221-6/+14
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer: Check for 0-spacing when loading grid settings.
| | * Designer: Check for 0-spacing when loading grid settings.Friedemann Kleint2011-02-211-6/+14
| | | | | | | | | | | | Task-number: QTBUG-17542
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-223-15/+23
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: 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
| | * | 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
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-218-15/+20
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: 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
| | * | 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
| | * | Fix compilation: Q_UNUSED takes exactly one variable that is unusedThiago Macieira2011-02-211-1/+1
| |/ /
| * | 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-1812-129/+114
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1810-102/+94
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-186-4/+39
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | * | | Added test case for corrupt pixel count in XPM image.Samuel Rødal2011-02-182-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed by merge request 1080. Task-number: QTBUG-17254
| | | | * | | 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-183-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-173-27/+20
| | | | |\ \ \ \
| | | | * | | | | 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-173-27/+20
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-173-27/+20
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-173-27/+20
| | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-02-1750-55/+646
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Made Q_ASSERT meaningful again Introduce new flag for splitview support in Symbian Fix for clipping failure in OpenVG paint engine. Use QML notation for documenting TextInput::accepted() signal. Document the TextInput accepted() signal. Fix inheritance of widget input contexts. Fix for ARMV6 drawhelper blending Keep sending posted events after commit 7196045b78b33cf135683d5c0b4e164f95231791 QStyleSheetStyle: dont crash in PE_WIDGET when widget is null Worked around a SC issue in S60 3.x vs 5.0 versions. Don't leak ScopeChainNode's Designer: Slots of main container not visible in signal/slot editor. Apply the gcce link rules for LIBS_PRIVATE too. Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X. Rename 'plugins\qmldebugging' (work around qmake issues) Correct the "module not installed" error handling Flickable uses the flick velocity to determine whether to retain grab Make addImportPath() work for windows paths starting with lower case Report any exceptions occurring in WorkerScript javascript code MouseArea docs - link to onCanceled() from onReleased()
| | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-1750-55/+646
| | |\ \ \ \ \ \ | |/ / / / / / / | | | _ / / / / | | | / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-153-4/+50
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix inheritance of widget input contexts.
| | | * | | | | Fix inheritance of widget input contexts.Andrew den Exter2011-02-153-4/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a parent widget has an input context assigned return that from QWidget::inputContext() before returning QApplication::inputContext(). Change-Id: I4982a91ace9b7485534f1c31fa4e2d549482640e Task-number: QTBUG-17390 Reviewed-by: axis
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-141-2/+2
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix for ARMV6 drawhelper blending
| | | * | | | | Fix for ARMV6 drawhelper blendingJani Hautakangas2011-02-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Asm code used wrong source register when doing constant alpha blending. Task-number: QTBUG-16008 Reviewed-by: TRUSTME
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-142-1/+20
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QStyleSheetStyle: dont crash in PE_WIDGET when widget is null
generated by cgit v0.12 at 2025-01-08 03:10:07 (GMT)