summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into 4.6-platformDenis Dzyubenko2009-11-09125-1381/+1758
|\
| * Dont set DontCreateNativeAncestors attribute.Denis Dzyubenko2009-11-091-1/+0
| | | | | | | | | | | | | | This fixes painting artifacts on dock widgets. It would be nice to use this attribute again once the painting is fixed. Reviewed-by: trustme
| * Merge commit 'qtwebkit/qtwebkit-4.6' into 4.6Jocelyn Turcotte2009-11-095-33/+46
| |\
| | * QNetworkCookie: Add the dot prefix of the domain while adding to the jarJocelyn Turcotte2009-11-094-29/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead than when parsing the cookie header. This corrects the bug QT-2379, happening in the following sequence: parseCookie -> setCookieUrl -> toRawForm -> parseCookie where a default domain would now also have a dot prefix, and shouldn't. QT-2379 Reviewed-by: Peter Hartmann
| | * Corrects bug in fancybrowser example where image rotation did not work.Jocelyn Turcotte2009-11-061-4/+3
| | | | | | | | | | | | | | | | | | | | | This is actually only a workaround of what seems to be a QtWebKit bug. See QTBUG-4649. Reviewed-by: Jedrzej Nowacki
| * | Update INSTALL and README + friends for the everywhere packageJason McDonald2009-11-096-391/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make INSTALL and README more generic, avoid repeating stuff that's already in the product docs, and move the Windows Signing stuff into the product docs. Task-number: QTBUG-5453 Reviewed-by: Espen Riskedal
| * | Doc: updated documentation for Google Suggest ExampleMorten Engvoldsen2009-11-091-96/+96
| | | | | | | | | | | | | | | | | | | | | | | | Documented the Google Suggest Example. Adding descriptions and screenshot. and correcting indent Task-number: QT-700 Rev-by: Volker Hilsheimer
| * | Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-0912-11/+42
| |\ \
| * | | My relevant changes-4.6.0 updatesMarkus Goetz2009-11-091-6/+24
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Morten Engvoldsen2009-11-09109-999/+1469
| |\ \ \
| | * | | Compile in 64bit with debugOlivier Goffart2009-11-091-1/+1
| | | | |
| | * | | Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-0995-286/+516
| | |\ \ \
| | | * | | API review: *Count() are not pluralMarius Storm-Olsen2009-11-095-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Obsolete the plural version, and replace its usage in Qt. Reviewed-by: Andreas Aardal Hanssen
| | | * | | API review: Rename numRects() -> rectCount()Marius Storm-Olsen2009-11-0916-40/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRegion::numRects() is marked obsolete. Removed all usage of the old function inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
| | | * | | API review: Rename numPages() -> pageCount()Marius Storm-Olsen2009-11-093-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPrintPreviewWidget wasn't following the Qt API naming convention of *Count()/set*Count(). Introduce proper function, and obsolete the old. Removed all usage of the old function in Qt. Reviewed-by: Andreas Aardal Hanssen
| | | * | | API review: Rename numDigits() and setNumDigits()Marius Storm-Olsen2009-11-094-22/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QLCDNumber doesn't follow the API convention of *Count and set*Count(). Introduce properly named functions, and obsolete the old ones. Reviewed-by: Andreas Aardal Hanssen
| | | * | | API review: Rename numCols() -> colorCount()Marius Storm-Olsen2009-11-066-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name numCols is ambiguous, as sometimes it's refering to the number of columns, and sometimes the number of colors. It also does not match the typical Qt naming convention *Count(). Reviewed-by: Tom Cooksey Reviewed-by: Andreas Aardal Hanssen
| | | * | | API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-0644-164/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPaintDevice and QImage used the functions numColors(), setNumColors(), and numBytes(). However, this is not consistent with the rest of the Qt API which uses *Count() and set*Count(). Removed all usage of these functions inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
| | | * | | API review: QRegExp::numCaptures() -> QRegExp::captureCount()Marius Storm-Olsen2009-11-0613-33/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRegExp::numCaptures() is marked as obsolete. Replaced all usage in Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
| | | * | | API review: QMatrix::det() -> QMatrix::determinant(), matching math3dMarius Storm-Olsen2009-11-062-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After an API review of the new math3d classes, the full name was considered better than the short version. Therefore we obsolete the short function, and introduce the longer version. Reviewed-by: Andreas Aardal Hanssen
| | | * | | API review: Add convenience functions using QMarginsMarius Storm-Olsen2009-11-066-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We added the class QMargins, so we should use it wherever we deal with margins, as a convenience to the users. Reviewed-by: Andreas Aardal Hanssen
| | * | | | Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6Marius Storm-Olsen2009-11-099-638/+829
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/qfsfileengine.cpp tests/auto/qfile/tst_qfile.cpp
| | | * | | | Removing semi-colon at the end of namespaceJoão Abecasis2009-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... was breaking symbian-abld build.
| | | * | | | Ensure IDC and UIC3 dependencies are correctMarius Storm-Olsen2009-11-052-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the refactoring to src/tools/tools.pro the dependencies for IDC and UIC3 ended up being incorrect, due to the eval rules later in that file. This patch adds IDC and UIC3 to SRC_SUBDIRS after Qt3Support, and before ActiveQt, so the dependencies remain correct as before the refactoring. The added condition of src/tools/tools.pro ensures that we add the tools to the Makefile in src/tools, should we decide to generate it, and compile from there. Reviewed-by: Jason McDonald
| | | * | | | Remove 4k-chunking in QFSFileEngine::read/writeFdFhJoão Abecasis2009-11-041-85/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a serious performance issue on Symbian and not necessarily optimal on other platforms. For the time being, we'll allow the OS to read/write as much as it can. Otherwise cleaned up the code, adding checks for invalid len arguments. Task-number: QT-2347 Reviewed-by: Peter Hartmann
| | | * | | | Extending tst_QFile::writeLargeDataBlock testJoão Abecasis2009-11-041-30/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To test not only native, but fd and FILE* backends as well. Moved expensive generation of large block into a separate function that caches the result. Reviewed-by: Peter Hartmann
| | | * | | | Add src/tools/tools.pro, and use when building host tools for xcompilingMarius Storm-Olsen2009-11-044-32/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure.exe would simply initiate a build for each of the tools in order. However, this would break certain distributed build systems, since they would return right away after initiating the make. Thus, sometimes moc et al. would try to link before bootstrap lib was built. Reviewed-by: Jason McDonald
| | | * | | | QHostInfo: do not wait forever on cleanupPeter Hartmann2009-11-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patch by Warwick Allison. On cleanup in QHostInfoAgent, we were waiting forever for the thread to terminate, which did not always succeed due to a Linux kernel bug. Now, we just wait for some time and then return anyway. Reviewed-by: Marius Storm-Olsen Task-number: QTBUG-5296
| | | * | | | QLocalSocket test: stabilize test by calling waitFor... functionPeter Hartmann2009-11-031-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to make sure bytes are availabe to read Reviewed-by: Aleksandar Sasha Babic
| | | * | | | QNetworkReply autotests: move performance tests to benchmarksPeter Hartmann2009-11-022-479/+530
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the performance tests from tests/auto/qnetworkreply to tests/benchmarks/qnetworkreply, because they belong there and they were crashing from time to time. Reviewed-by: Markus Goetz
| | * | | | | Default to X11 instead of QWS for commercial buildsPaul Olav Tvete2009-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago Reviewed-by: Jason McDonald
| | * | | | | My changes for 4.6.0Peter Hartmann2009-11-091-0/+29
| | | | | | |
| * | | | | | ÿþdMorten Engvoldsen2009-11-096-30/+191
| | | | | | |
* | | | | | | Modified windowflags manualtestDenis Dzyubenko2009-11-092-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a few buttons to maximize a window from the code. Reviewed-by: trustme
* | | | | | | Add error handling for SetTimer() with the sentinel timer idBradley T. Hughes2009-11-091-3/+11
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If SetTimer() fails when trying to delay sendPostedEvents(), emit a warning and try to continue. Reviewed-by: mauricek
* | | | | | Fixed pan gesture handlers in standard Qt widgets.Denis Dzyubenko2009-11-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Richard
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Bradley T. Hughes2009-11-09193-2069/+5368
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qwidget_win.cpp
| * | | | | Doc: typo fixedJoerg Bornemann2009-11-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | Updated change logPrasanth Ullattil2009-11-091-71/+91
| |/ / / /
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6jasplin2009-11-092-0/+23
| |\ \ \ \
| | * | | | More inDestructor checks.Warwick Allison2009-11-091-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Declarative tripped these (crashes). Reviewed-by:Aaron Kennedy
| | * | | | Crash on bug QTBUG-5493Warwick Allison2009-11-091-0/+14
| | | | | |
| * | | | | My changes.jasplin2009-11-091-0/+12
| |/ / / /
| * | | | Merge commit 'ceteam/4.6' into 4.6Joerg Bornemann2009-11-096-11/+90
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| | * | | | changes-4.6.0 updatedJoerg Bornemann2009-11-061-0/+11
| | | | | |
| | * | | | my changes for 4.6.0Joerg Bornemann2009-11-061-1/+4
| | | | | |
| | * | | | fix QWizard issues on Windows CEJoerg Bornemann2009-11-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was reproducable with the example in <QTDIR>\examples\dialogs\trivialwizard You could not push the navigation buttons using the stylus. Task-number: QTBUG-3613 Reviewed-by: thartman
| | * | | | fixes button size for Windows mobile styleJoerg Bornemann2009-11-061-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old button sizes were just to big. For example the trivialwizard example had a minimal width that was much too wide for the screen. Task-number: QTBUG-3613 Reviewed-by: thartman
| | * | | | cetest crashes and no helpful debugging providedKeith Isdale2009-11-061-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unguarded use of QList::first() leads to Q_ASSERT() if the list is empty Add support for a "-d" option to project file print parser debugging Do not make use of QMAKESPEC variables in .qmake.cache instead determine the current default if mkspec was not passed to cetest Task-number: QTBUG-5490 Reviewed-by: Lincoln Ramsay Joerg Bornemann
| | * | | | compilefixes for qfeaturesThomas Hartmann2009-11-064-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Maurice