summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: Corrected some qdoc warnings.Martin Smith2009-04-281-1/+1
|
* 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
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-201-127/+137
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: src/gui/itemviews/qheaderview_p.h
| | * | Make temporary files close-on-execOswald Buddenhagen2009-04-181-0/+11
| | | | | | | | | | | | | | | | Reviewed-By: thiago
| | * | sanitize whitespace & parenthesesOswald Buddenhagen2009-04-181-128/+127
| | |/
* | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-2284-113/+15465
|/ /
* | Merge commit 'remotes/tb-optim/qvariant-optimizations'Thierry Bastian2009-04-173-60/+88
|\ \
| * | make construction for known type fasterThierry Bastian2009-03-312-23/+34
| | | | | | | | | | | | There is one less test thanks to usage of reference instead of pointers
| * | make the float constructor inline (improves construction/destruction ↵Thierry Bastian2009-03-312-3/+1
| | | | | | | | | | | | performance by 20%)
| * | small change wrt to destruction (patch suggested by ogoffart)Thierry Bastian2009-03-311-5/+9
| | |
| * | add proper support for floats to QVariantThierry Bastian2009-03-262-7/+21
| | |
| * | Improved qVariantSetValue by reusing the internals if possibleThierry Bastian2009-03-261-1/+12
| | | | | | | | | | | | | | | This is possible if the type is the same of type < Char (simple types)
| * | small simplification in internals of QVariantThierry Bastian2009-03-261-25/+4
| | | | | | | | | | | | constDataHelper dones't need to know about the type if the variant
| * | Added template to the private classes to avoid double allocation in QVariantThierry Bastian2009-03-261-7/+18
| | |
| * | Avoids calling function pointer in constructor of QVariantThierry Bastian2009-03-261-23/+23
| | | | | | | | | | | | Instead, it calls directly the v_construct template function.
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-172-5/+5
|\ \ \ | | |/ | |/| | | | | | | Conflicts: tests/auto/qpainterpath/tst_qpainterpath.cpp
| * | fix reading problem on 64-bit machines in QProcess and socket enginePeter Hartmann2009-04-162-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QProcessPrivate and QNativeSocketEnginePrivate were reporting a wrong number of bytes available on 64-bit machines, due to use of size_t in ioctl. That was required by Irix, which we dropped support for, so we can also drop size_t Reviewed-by: Thiago Task-number: 249537
| * | Silence warning about unused static function on WindowsJoão Abecasis2009-04-151-0/+2
| | | | | | | | | | | | Reviewed-by: mariusSO
| * | Doc - clarified that on Windows, for 32-bit programs running in WOW64Kavindra Devi Palaraja2009-04-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | mode, the settings are stored in HKEY_LOCAL_MACHINE\Software\WOW6432node. Task-number: 232011 Reviewed-by: Martin Petersson <martin.petersson@trolltech.com>
| * | BT: Fix Cocoa bug w/OpenGL widgets in dock widgets would disappear.Norwegian Rock Cat2009-04-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NSOpenGLContext seems to be tied to the window. So if the view changes from one window to another, the OpenGL context needs to be cleared. We can do this by hooking into the viewWillChangeWindow and viewDidChangeWindow events and clear and reset the drawable respectively. We also found out that QCocoaOpenGLView was not being used at all, so just remove it to get rid of any confusion. Task-number: 250066 Reviewed-by: Trond
* | | Condense this code into one single case. Avoid duplicating code.Thiago Macieira2009-04-161-11/+6
| | | | | | | | | | | | | | | | | | Just because I can. Reviewed-by: Bradley T. Hughes
generated by cgit v0.12 at 2024-10-25 03:33:01 (GMT)