summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update licenseheader text in source filesJyri Tahtela2011-05-137936-131576/+131576
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Fix incorrect hardware address on systems without getifaddrs()Craig Scott2011-05-111-1/+1
| | | | | | | | | | | | | | | On unix systems for which QT_NO_GETIFADDRS is defined, the way that the hardware address field is extracted from the result of a call to qt_safe_ioctl() is incorrect. The address of the ifreq.ifr_addr struct is taken rather than the appropriate member within that struct, sa_data, resulting in a memory offset and subsequently the hardware address has garbage in the first two of six fields. This commit modifies the code to pass the sa_data member instead of the address of the struct as a whole. Task-number: QTBUG-19165 Merge-request: 2614 Reviewed-by: Martin Petersson
* emit QNetWorkAccessManager::finished on QNetworkReply::abort()Martin Petersson2011-05-091-0/+2
| | | | | | | | | | | If we can not get online when the request is made then we are in the WaitingForSession state. This will happen for example if the device is in flight mode. This fix follows the same logic as in _q_networkSessionFailed, but we should look into why we have the WaitingForSession check in finished(). Task-number: QT-4747 Reviewed-by: Markus Goetz
* Fix -no-guiBernhard Rosenkraenzer2011-05-091-2/+2
| | | | | | | | -no-gui still tried to build the graphicssystem and inputmethod plugins, both of which require QtGui Merge-request: 1215 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't run XLib check if -no-gui is usedBernhard Rosenkraenzer2011-05-091-1/+1
| | | | | | | | | | | Currently, an attempt to compile Qt even with -no-gui on a Linux box that doesn't have libX11 installed fails becaue of the XLib functionality check in configure. This check can be turned off in -no-gui mode, since QtCore, QtXml, QtNetwork and friends don't use libX11. Merge-request: 1214 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Ukrainian translation updatedVictor Ostashevsky2011-05-092-9/+5
|
* fix random miscompilation with msvcOswald Buddenhagen2011-05-061-0/+1
| | | | Reviewed-by: joerg
* don't ignore create_prl for static pluginsOswald Buddenhagen2011-05-061-1/+1
| | | | | Task-number: QTBUG-18436 Reviewed-by: joerg
* make QLibraryInfo return clean pathsOswald Buddenhagen2011-05-061-4/+6
| | | | | | | | as a side effect, don't use QDir for path resolution - it doesn't buy us anything. Task-number: QTBUG-1371 Reviewed-by: joerg
* make relative paths in qt.conf work inside qmakeOswald Buddenhagen2011-05-061-1/+1
| | | | | Task-number: QTBUG-11602 Reviewed-by: joerg
* QNAM: Re-order checks in migrateBackend()Markus Goetz2011-05-051-4/+4
| | | | | | | | Do the easy checks first, will avoid a crash in the HTTP code if request is serviced from the cache. Task-number: QTBUG-18770 Reviewed-by: Peter Hartmann
* QNAM HTTP: Fix bug with explicitly zero-length compressed responses.Andreas Kling2011-05-042-1/+28
| | | | | | | | | In the case of a response with e.g content-encoding "gzip" and content-length "0", the HTTP backend would incorrectly fall back to the "unspecified length" code path and wait for readyRead() forever. Task-number: QTBUG-18232 Reviewed-by: Markus Goetz
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-032-2/+3
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Don't rely on uninitialized data Don't realloc user-provided buffer
| * Don't rely on uninitialized dataJoão Abecasis2011-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | HB_GetCharAttributes used to require a zero-initialized array for attributes, as it selectively sets relevant bits for each character. We ease that requirement by always initializing the attributes buffer explicitly with memset. Task-number: QT-4911 Reviewed-by: Ritt Konstantin
| * Don't realloc user-provided bufferJoão Abecasis2011-05-031-2/+2
|/ | | | | | | When QTextBoundaryFinder doesn't own the buffer, don't realloc it and get a new one instead. Reviewed-by: Ritt Konstantin
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-031-1/+1
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Clarified sendCustomRequest documentation to include HTTPS
| * Clarified sendCustomRequest documentation to include HTTPSJanne Anttila2011-05-031-1/+1
| | | | | | | | Reviewed-By: mgoetz
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-05-0215-204/+312
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Fixing potential js hole in the js function for the feedback channel. qdoc: Completed task QTBUG-18790 qdoc: Completed task QTBUG-18733 qdoc: Last commit before merge into master. Doc: Fixed reference to a name in a table. qdoc: Fixed license comment. Ensured that incomplete downloads are removed. qdoc: Added missing copyright notice qdoc: Updated the QDoc manual. qdoc: Updated the QDoc manual. qdoc: Updated the QDoc manual. qdoc: Updated the QDoc manual. qdoc: Fixed QTBUG-18591 Aim to fix Windows builds.
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-05-0215-204/+312
| |\ \
| | * \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-291-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Fixing potential js hole in the js function for the feedback channel.
| | | * | Fixing potential js hole in the js function for the feedback channel.Morten Engvoldsen2011-04-291-1/+1
| | | | |
| | * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-151-0/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Completed task QTBUG-18790
| | | * | qdoc: Completed task QTBUG-18790Martin Smith2011-04-151-0/+2
| | | | |
| | * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-145-125/+74
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Completed task QTBUG-18733
| | | * | qdoc: Completed task QTBUG-18733Martin Smith2011-04-145-125/+74
| | | | |
| | * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-132-1/+27
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Last commit before merge into master.
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-04-133-2/+10
| | | |\ \
| | | * | | qdoc: Last commit before merge into master.Martin Smith2011-04-132-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a function to class Config to unload the qdocconf file. This is for the qdoc wizard.
| | * | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-113-2/+10
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Doc: Fixed reference to a name in a table. Ensured that incomplete downloads are removed.
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-111-21/+7
| | | |\ \ \ | | | | |/ /
| | | * | | Doc: Fixed reference to a name in a table.David Boddie2011-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18679
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-073-50/+184
| | | |\ \ \
| | | * | | | Ensured that incomplete downloads are removed.David Boddie2011-04-072-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18509
| | * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-081-21/+7
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Fixed license comment.
| | | * | | | qdoc: Fixed license comment.Martin Smith2011-04-081-21/+7
| | | | |/ / | | | |/| |
| | * | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-075-75/+210
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Added missing copyright notice qdoc: Updated the QDoc manual. qdoc: Updated the QDoc manual. qdoc: Updated the QDoc manual. qdoc: Updated the QDoc manual. Aim to fix Windows builds.
| | | * | | qdoc: Added missing copyright noticeMartin Smith2011-04-071-0/+41
| | | | | |
| | | * | | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-5/+6
| | | | | |
| | | * | | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-10/+13
| | | | | |
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-04-071-1/+3
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-064-24/+25
| | | | |\ \
| | | | * | | Aim to fix Windows builds.David Boddie2011-04-051-1/+3
| | | | | | |
| | | * | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-072-39/+128
| | | | |/ / | | | |/| |
| | | * | | qdoc: Updated the QDoc manual.Martin Smith2011-04-063-24/+23
| | | | | |
| | * | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-061-0/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Fixed QTBUG-18591
| | | * | | qdoc: Fixed QTBUG-18591Martin Smith2011-04-061-0/+2
| | | |/ /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-05-0218-133/+1135
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Fix tst_Q3ProgressBar::setProgress, again Disable tst_Q3ComboBox::task231724_clear on Mac Fix tst_Q3ProgressBar::setProgress() Revert "Fix double painting when adding an item into a linear layout" Add missing license headers Revert "Fixed a crash in QListView" Benchmark for layout hierarchies Manual test for layout flickering Improve invalidate() testcase. Avoid flicker when invalidate is propagated in a widget/layout hierarchy Do not call setSizePolicy from ctor, it might call a virtual function Fixed a crash in QListView
| * \ \ \ \ Merge branch '4.7-review' into 4.7-stagingThierry Bastian2011-05-0218-133/+1135
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-05-021574-20469/+89892
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (572 commits) Fix tst_Q3ProgressBar::setProgress, again Disable tst_Q3ComboBox::task231724_clear on Mac Fix tst_Q3ProgressBar::setProgress() Revert "Fix double painting when adding an item into a linear layout" Add missing license headers Revert "Fixed a crash in QListView" Symbol table is very limited in numeric input mode Fix build of Qt/DirectFB without graphics view support. Add new QSysInfo::symbianVersion() enums QDesktopServices::openUrl() doesn't handle URL encodings correctly Build fix for transition effect support on S60 5.0. Make EGL surface transparency working on Symbian. QmlDebug: Fix license headers in new ost plugin Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79 Resolve unqualified attached properties correctly Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian. QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp' QDeclarativeDebug: Don't crash when connection is closed Benchmark for layout hierarchies Manual test for layout flickering ...
| | | * | | | Fix tst_Q3ProgressBar::setProgress, againGabriel de Dietrich2011-04-291-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jan-Arve
generated by cgit v0.12 at 2024-10-14 04:00:50 (GMT)