summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-2317-204/+547
|\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed shadow builds on Unix. Fixed linkage failure when building qmake on Unix platforms Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-2317-204/+547
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed shadow builds on Unix. Fixed linkage failure when building qmake on Unix platforms Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake
| | * Fixed shadow builds on Unix.Rohan McGovern2010-02-231-1/+1
| | |
| | * Fixed linkage failure when building qmake on Unix platformsGareth Stockwell2010-02-231-2/+0
| | | | | | | | | | | | | | | | | | | | | Commits f641369c/5254184c and 13cb80be/6ebcf2c2 caused registry.o and epocroot.o respectively to be included twice during the linkage step of qmake/Makefile.unix. (cherry picked from commit 480f3df2eab9ad13e0d7ea1245158866a0b942bd)
| | * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-2313-106/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented in its own source file, rather than being embedded within the Symbian qmake generator. The motivation for this is to allow code to be shared between qmake and configure - the latter needs to determine the epoc root path in order to perform feature detection on Symbian SDKs. Reviewed-by: Miikka Heikkinen (cherry picked from commit 6ebcf2c24b43fdc1d6da50e9d7ec9dd63dd507d7)
| | * Factored readRegistryKey implementation out of qmakeaxis2010-02-239-100/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen (cherry picked from commit 5254184c07b4da800e29000a251ed2a026bd2be5) Conflicts: qmake/Makefile.unix
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-231-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix compilation with namespace.
| * | | Fix compilation with namespace.ck2010-02-231-1/+2
| |/ /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-23119-1930/+2183
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (33 commits) Use QTRY_COMPARE to give the animation a chance to finish Cocoa: Sheets loose their opacity on 2nd show Added function overload for QByteArray &QByteArray::replace() Second attempt at work-around for MSVC2008 compiler crash QNativeSocketEngine: Fix some error handling related to waitFor*() qdoc: List new QML elements in \sincelist for What's New page. Cocoa: fix namespace build Cocoa: Fix build with namespace Cocoa: namespace build fix doc: Fixed some qdoc errors. Don't include private headers from public headers. Fix compilation on HP-UXi: m_volume is a #define WinCE doesn't have sys/types.h Fix compilation: qmlviewer cannot use symbols exported with Q_AUTOTEST_EXPORT in production builds Fix compilation on recent Linux systems: getpid(2) is in unistd.h. Cocoa: calling QEventLoop::exec from mouse up causes problem Fix compilation on GNU/Hurd (SA_SIGINFO isn't defined) Doc: Collected the Declarative UI tutorials together and renamed them. Doc: Simplified Commercial Editions for Qt 4.7. Work around MSVC2008 compiler crash ...
| * | Merge remote branch 'origin/master'Thiago Macieira2010-02-23285-2838/+2662
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc doc/src/declarative/tutorial2.qdoc doc/src/declarative/tutorial3.qdoc src/declarative/graphicsitems/qmlgraphicsmousearea.cpp src/multimedia/playback/qmediaplayer.cpp
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-2311-158/+236
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: clean up x11 desktop detection avoid double reallocations in inserting operations create temporaries more intelligently do not protect against self-assignment in QList::replace() make queues to which only lists are appended not blow the memory optimize queue-like structures remove more pointless recalculations Fix compilation with namespace. Fix compilation with namespace.
| * | clean up x11 desktop detectionOswald Buddenhagen2010-02-222-90/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KDE_FULL_SESSION is reliable since kde 2.x or so. DESKTOP_SESSION is not reliable, unless one uses a new gnome. GNOME_DESKTOP_SESSION_ID was temporarily unreliable. the two together should be reliable. copy the xfce4 detection from the xdg-open tool. assumed to be reliable. remove the window manager hacks, as they are redundand with the asssumedly reliable detection methods above. Reviewed-by: jbache
| * | avoid double reallocations in inserting operationsOswald Buddenhagen2010-02-222-35/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operator+=() and co. would first detach, and then realloc if they found the reservation too small. in particular, appending anything to an empty list would trigger this double reallocation (first copy shared_null, then grow the copy). entirely rewritten take 3, this time without memory corruption or exhaustion ... :) Reviewed-by: joao
| * | create temporaries more intelligentlyOswald Buddenhagen2010-02-221-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we already know that we are dealing with a movable type, so it is safe to keep a temporary copy of the raw data instead of going through the copy c'tor. this way we save a pretty useless ref()/deref() pair for each and every insertion of an implicitly shared type into a QList. the QtPodForSize class is somewhat ugly. we should use QIntegerForSize, but that's not possible without having separate template specializations, which is not possible without some bigger changes to the qt type info system. it will be beautified in due time. :) Reviewed-by: joao
| * | do not protect against self-assignment in QList::replace()Oswald Buddenhagen2010-02-221-6/+1
| | | | | | | | | | | | | | | | | | it's not the task of the container class to do so. Reviewed-by: joao
| * | make queues to which only lists are appended not blow the memoryOswald Buddenhagen2010-02-222-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | append2(list) didn't use the array shifting logic the append() for single elements does. this would cause the list to grow endlessly despite leading elements being removed if only lists were ever appended. Reviewed-by: joao
| * | optimize queue-like structuresOswald Buddenhagen2010-02-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a list to which we append after we took something from the beginning is most likely a queue, and it seems unlikely that we would suddenly start prepending to it. consequently, optimizing the prepending case by leaving the first third of the allocation free just increases the number of times the array needs to be shifted down. Reviewed-by: joao
| * | remove more pointless recalculationsOswald Buddenhagen2010-02-221-3/+3
| | | | | | | | | | | | Reviewed-by: joao
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-227-8/+19
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix compilation with namespace. Fix compilation with namespace.
| | * | Fix compilation with namespace.ck2010-02-226-6/+17
| | | |
| | * | Fix compilation with namespace.ck2010-02-221-2/+2
| | | |
* | | | Merge branch 'qt-master-from-4.6' of ↵Qt Continuous Integration System2010-02-232-1/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Don't process uic3 subdir if qt3support is disabled. Fixed failure of tst_symbols when Qt is configured with -qtnamespace
| * \ \ \ Merge branch 'qt-master-from-4.6' of ↵Qt Continuous Integration System2010-02-222-1/+15
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Don't process uic3 subdir if qt3support is disabled. Fixed failure of tst_symbols when Qt is configured with -qtnamespace
| | * | | Merge remote branch 'origin/master' into integration-master-from-4.6Rohan McGovern2010-02-221-1/+1
| | |\ \ \ | | | |/ /
| | * | | Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-222-1/+15
| | |\ \ \
| | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-222-1/+15
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't process uic3 subdir if qt3support is disabled. Fixed failure of tst_symbols when Qt is configured with -qtnamespace
| | | | * | | Don't process uic3 subdir if qt3support is disabled.Rohan McGovern2010-02-221-1/+3
| | | | | | |
| | | | * | | Fixed failure of tst_symbols when Qt is configured with -qtnamespaceRohan McGovern2010-02-221-0/+12
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Blacklist some symbols which cannot be namespaced when Qt is configured in a namespace.
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-23277-2687/+2419
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Make uncached text painting work for richtext too. Updated based on change to transformOrign Documentation Update Doc fix Remove race condition in remote pixmap cancelling. Replace QmlList* and QList* support with a single QmlListProperty type Rename MouseRegion -> MouseArea Update QmlChanges with animation API changes. Document the default velocity of EaseFollow Remove use of unexprted private classes. Fix compile error on Solaris Increase durations when testing Behaviors. Add cached path rounded rect painting benchmark. Remove use of direct event posting. Use QTest::keyClick() for keys.
| * | | | | Make uncached text painting work for richtext too.Martin Jones2010-02-232-3/+12
| | | | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-225-0/+5
| |\ \ \ \ \
| | * | | | | Updated based on change to transformOrignNigel Hietala2010-02-225-0/+5
| | | | | | |
| * | | | | | Documentation UpdateAlan Alpert2010-02-221-1/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Mention that the same game tutorial is now slightly different to the demo version.
| * | | | | Doc fixAlan Alpert2010-02-221-1/+1
| | | | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-22947-72470/+61700
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-22268-2665/+2384
| | |\ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Replace QmlList* and QList* support with a single QmlListProperty type Rename MouseRegion -> MouseArea Update QmlChanges with animation API changes. Document the default velocity of EaseFollow Remove use of unexprted private classes. Fix compile error on Solaris Increase durations when testing Behaviors. Add cached path rounded rect painting benchmark. Remove use of direct event posting. Use QTest::keyClick() for keys.
| | * | | | | Replace QmlList* and QList* support with a single QmlListProperty typeAaron Kennedy2010-02-22113-2218/+1931
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a value type QmlListProperty doesn't consume any memory in the object. It also has a companion QmlListReference class that is part of the public API for C++ developers to interact with that also manages memory issues that existed with previous solutions (if the containing QObject was destroyed it left a dangling pointer).
| * | | | | | Remove race condition in remote pixmap cancelling.Martin Jones2010-02-221-17/+12
| |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-221-0/+5
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMichael Brasser2010-02-2210-93/+83
| | |\ \ \ \ \
| | * | | | | | Update QmlChanges with animation API changes.Michael Brasser2010-02-221-0/+5
| | | | | | | |
| * | | | | | | Rename MouseRegion -> MouseAreaMartin Jones2010-02-22144-307/+310
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2217-90/+89
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-2212-47/+55
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Increase durations when testing Behaviors.Michael Brasser2010-02-2210-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make the tests at least somewhat more reliable.
| | * | | | | | Fix compile error on SolarisAaron Kennedy2010-02-227-66/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-8267. Remove templating from QmlTimeLineEvent class (and rename it to QmlTimeLineCallback to more represent what it is).
| * | | | | | | Document the default velocity of EaseFollowMartin Jones2010-02-221-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8181
| * | | | | | | Remove use of unexprted private classes.Martin Jones2010-02-222-26/+8
| | |/ / / / / | |/| | | | |
| * | | | | | Add cached path rounded rect painting benchmark.Martin Jones2010-02-221-0/+24
| | | | | | |
| * | | | | | Remove use of direct event posting. Use QTest::keyClick() for keys.Martin Jones2010-02-221-23/+7
| |/ / / / /
generated by cgit v0.12 at 2025-01-10 15:14:45 (GMT)