summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: Corrected some qdoc warnings.Martin Smith2009-04-301-1/+1
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-281-2/+3
|\ | | | | | | kinetic-declarativeui
| * Compile Warnings removed in canConvertThierry Bastian2009-04-281-2/+3
| | | | | | | | | | | | | | | | These were caused by a comparison between QVariant::Type and QMetaType::Type. We're using QMetaType::Float because QVariant have no such Float value Reviewed-by: denis
* | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-04-281-1/+1
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-281-1/+1
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-2812-57/+70
|\ \ \ | | |/ | |/| | | | kinetic-declarativeui
| * | Fixed to float support in QVariantThierry Bastian2009-04-271-25/+33
| | | | | | | | | | | | also added autotests
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-242-5/+2
| |\ \
| | * | Return the correct MIB number for TSCII. When the code wasFrans Englich2009-04-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | written, IANA hadn't assigned one. Requested/spotted by Nokia i18n team. Task-number: 251790 Reviewed-by: Brad Reviewed-by: Denis AutoTest: In this submit.
| | * | Alias for QUtf16Codec is wrong.Frans Englich2009-04-241-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requested/spotted by Nokia i18n team/Darpan. Task-number: 252102 Reviewed-by: Denis AutoTest: In this submit.
| | * | Change Qt version number to 4.5.2Thiago Macieira2009-04-241-2/+2
| | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| * | | Remove the Direct3D engine.Gunnar Sletta2009-04-241-8/+7
| | | |
| * | | Merge branch '4.5'Thiago Macieira2009-04-232-2/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| | * | Fixes for QByteArrayMatcherJoão Abecasis2009-04-232-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy constructor and assignment operator lose data: pointer to content and the length of content also need to be copied over. QByteArrayMatcher::pattern() would return a null byte array if instance was initialized with c-string. Changed default constructor to explicitly initialize pattern length to zero. The bug in the assignment operator is a regression against 4.4.3. Task-number: 251958 Reviewed-by: MariusSO Reviewed-by: paul
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-234-6/+8
| |\ \ \ | | |/ /
| | * | Allow QThread to start a QTimer and QEventLoop before QCoreApplication is ↵Bradley T. Hughes2009-04-234-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constructed Fix a regression from 4.3 to 4.4 that prevented QThread from starting timers and event loops before QCoreApplication was instantiated. Even though this is documented not to work, it seems that people have been relying on it. This reverts commit e52e5acdfa198cd079bbfe3a9302debf46c7cadd which attempted to work around not calling g_thread_init() multiple times. The proper fix is to serialize the g_thread_supported() checks in the Glib event dispatcher. Task-number: 248191 Reviewed-by: denis
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-232-11/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h
| | * | Doc fixesJoão Abecasis2009-04-221-0/+1
| | | | | | | | | | | | | | | | Reviewed-by: Thiago
| | * | Make make_qfeatures_dot_h script generate the current copyright header.Jason McDonald2009-04-221-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the script, and update the generated file. Reviewed-by: Thiago Reviewed-by: Paul Olav Tvete
* | | | Revert "Fix sefaults introduced by merge."Michael Brasser2009-04-283-76/+83
| |_|/ |/| | | | | | | | This reverts commit 0e8b82bc7b9b0d88e8cc4a4d293851795d35950a.
* | | Add a declarative data ptr to QObjectPrivateAaron Kennedy2009-04-272-1/+19
| | | | | | | | | | | | This data ptr does not increase the size of the QObject, as we take advantage of space only used during destruction. Currently this data is only used to store an object's QmlContext, but it will be used for more later.
* | | Simplify QMetaProperty::propertyIndex functionAaron Kennedy2009-04-271-1/+1
| | | | | | | | | | | | RevBy: Kent Hansen
* | | Fix sefaults introduced by merge.Michael Brasser2009-04-233-83/+76
| | | | | | | | | | | | | | | For now, use kinetic-animations' version of the qvariant changes, as the ones in master cause segfaults.
* | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-04-222-20/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/gui/animation/qguivariantanimation.cpp
| * | | Fixes QPropertyAnimation's default start value update conditionLeonardo Sobral Cunha2009-04-222-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The default start value is updated when the animation changes from Stopped to Running state. Reviewed-by: Jan-Arve
* | | | Fix merge error.Michael Brasser2009-04-221-4/+30
| | | |
* | | | Merge branch 'kinetic-animations' of ../../qt/kinetic into kinetic-declarativeuiMichael Brasser2009-04-2258-1787/+2190
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | | Expose QVariantAnimationPrivate::getInterpolator in the private headerLeonardo Sobral Cunha2009-04-212-2/+4
| | | | | | | | | | | | | | | | These interpolator functions might be useful for other internal classes.
| * | | QPropertyAnimation reevaluates the default start value after each runLeonardo Sobral Cunha2009-04-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the start value is not explicitly defined, the property animation will set the default start to be the current property value when updating the animation's state to Running. Reviewed-by: Jan-Arve
| * | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-211-1/+2
| |\ \ \
| | * | | Fixes bug when adding the same child animation twice to the same groupLeonardo Sobral Cunha2009-04-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The child animation was removed twice from the group because in QAnimationGroup::insertAnimationAt the insertion in the list was done before removing the animation. Reviewed-by: Jan-Arve
| * | | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-2111-92/+90
| |\ \ \ \ | | |/ / /
| | * | | don't assert if the signal is not validKent Hansen2009-04-211-1/+2
| | | | |
| | * | | remove QItemAnimation and add the interpolator for QColorThierry Bastian2009-04-202-3/+1
| | | | |
| | * | | iterationCount becomes loopCount againThierry Bastian2009-04-209-89/+89
| | | | |
| * | | | rename QTransition -> QActionTransitionKent Hansen2009-04-2113-87/+88
| | | | |
| * | | | don't assert if the signal is not validKent Hansen2009-04-211-1/+2
| | | | |
| * | | | initialize "for-future-expansion"-pointerKent Hansen2009-04-201-1/+1
| |/ / /
| * | | docKent Hansen2009-04-2011-6/+23
| | | |
| * | | more docKent Hansen2009-04-172-2/+6
| | | |
| * | | docKent Hansen2009-04-173-3/+4
| | | |
| * | | compileKent Hansen2009-04-171-0/+2
| | | |
| * | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-1736-214/+617
| |\ \ \
| | * \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-04-1736-214/+617
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * | | | Initial import of kinetic-animations branch from the old kineticAlexis Menard2009-04-17465-0/+229562
| | / / / | | | | | | | | | | | | | | | repository to the new repository
| * | | | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-17463-0/+229936
| / / /
* | | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-223-131/+141
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '4.5'Thiago Macieira2009-04-202-4/+4
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| | * | don't detach in qHash()Lars Knoll2009-04-201-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | Unable to build ActiveQt with Opensource edition.Prasanth Ullattil2009-04-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the project files and headers necessary for enabling this. Reviewed-by: Thiago Macieira Reviewed-by: Jens Bache-Wiig
generated by cgit v0.12 at 2024-11-17 18:55:01 (GMT)