Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | qdoc: Corrected some qdoc warnings. | Martin Smith | 2009-04-28 | 1 | -1/+1 |
| | |||||
* | Add a declarative data ptr to QObjectPrivate | Aaron Kennedy | 2009-04-27 | 2 | -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 function | Aaron Kennedy | 2009-04-27 | 1 | -1/+1 |
| | | | | RevBy: Kent Hansen | ||||
* | Fix sefaults introduced by merge. | Michael Brasser | 2009-04-23 | 3 | -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 Brasser | 2009-04-22 | 2 | -20/+16 |
|\ | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/gui/animation/qguivariantanimation.cpp | ||||
| * | Fixes QPropertyAnimation's default start value update condition | Leonardo Sobral Cunha | 2009-04-22 | 2 | -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 Brasser | 2009-04-22 | 1 | -4/+30 |
| | | |||||
* | | Merge branch 'kinetic-animations' of ../../qt/kinetic into kinetic-declarativeui | Michael Brasser | 2009-04-22 | 58 | -1787/+2190 |
|\ \ | |/ | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| * | Expose QVariantAnimationPrivate::getInterpolator in the private header | Leonardo Sobral Cunha | 2009-04-21 | 2 | -2/+4 |
| | | | | | | | | These interpolator functions might be useful for other internal classes. | ||||
| * | QPropertyAnimation reevaluates the default start value after each run | Leonardo Sobral Cunha | 2009-04-21 | 1 | -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-statemachine | Kent Hansen | 2009-04-21 | 1 | -1/+2 |
| |\ | |||||
| | * | Fixes bug when adding the same child animation twice to the same group | Leonardo Sobral Cunha | 2009-04-21 | 1 | -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-statemachine | Kent Hansen | 2009-04-21 | 11 | -92/+90 |
| |\ \ | | |/ | |||||
| | * | don't assert if the signal is not valid | Kent Hansen | 2009-04-21 | 1 | -1/+2 |
| | | | |||||
| | * | remove QItemAnimation and add the interpolator for QColor | Thierry Bastian | 2009-04-20 | 2 | -3/+1 |
| | | | |||||
| | * | iterationCount becomes loopCount again | Thierry Bastian | 2009-04-20 | 9 | -89/+89 |
| | | | |||||
| * | | rename QTransition -> QActionTransition | Kent Hansen | 2009-04-21 | 13 | -87/+88 |
| | | | |||||
| * | | don't assert if the signal is not valid | Kent Hansen | 2009-04-21 | 1 | -1/+2 |
| | | | |||||
| * | | initialize "for-future-expansion"-pointer | Kent Hansen | 2009-04-20 | 1 | -1/+1 |
| |/ | |||||
| * | doc | Kent Hansen | 2009-04-20 | 11 | -6/+23 |
| | | |||||
| * | more doc | Kent Hansen | 2009-04-17 | 2 | -2/+6 |
| | | |||||
| * | doc | Kent Hansen | 2009-04-17 | 3 | -3/+4 |
| | | |||||
| * | compile | Kent Hansen | 2009-04-17 | 1 | -0/+2 |
| | | |||||
| * | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-04-17 | 36 | -214/+617 |
| |\ | |||||
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations | Alexis Menard | 2009-04-17 | 36 | -214/+617 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| | * | | Initial import of kinetic-animations branch from the old kinetic | Alexis Menard | 2009-04-17 | 465 | -0/+229562 |
| | / | | | | | | | | | | repository to the new repository | ||||
| * | | Initial import of statemachine branch from the old kinetic repository | Alexis Menard | 2009-04-17 | 463 | -0/+229936 |
| / | |||||
* | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeui | Michael Brasser | 2009-04-22 | 3 | -131/+141 |
|\ \ | |||||
| * \ | Merge branch '4.5' | Thiago Macieira | 2009-04-20 | 2 | -4/+4 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp | ||||
| | * | | don't detach in qHash() | Lars Knoll | 2009-04-20 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Thiago Macieira <thiago.macieira@nokia.com> | ||||
| | * | | Unable to build ActiveQt with Opensource edition. | Prasanth Ullattil | 2009-04-20 | 1 | -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/qt | Simon Hausmann | 2009-04-20 | 1 | -127/+137 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: src/gui/itemviews/qheaderview_p.h | ||||
| | * | | Make temporary files close-on-exec | Oswald Buddenhagen | 2009-04-18 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | Reviewed-By: thiago | ||||
| | * | | sanitize whitespace & parentheses | Oswald Buddenhagen | 2009-04-18 | 1 | -128/+127 |
| | |/ | |||||
* | | | Initial import of kinetic-dui branch from the old kinetic | Michael Brasser | 2009-04-22 | 84 | -113/+15465 |
|/ / | |||||
* | | Merge commit 'remotes/tb-optim/qvariant-optimizations' | Thierry Bastian | 2009-04-17 | 3 | -60/+88 |
|\ \ | |||||
| * | | make construction for known type faster | Thierry Bastian | 2009-03-31 | 2 | -23/+34 |
| | | | | | | | | | | | | There is one less test thanks to usage of reference instead of pointers | ||||
| * | | make the float constructor inline (improves construction/destruction ↵ | Thierry Bastian | 2009-03-31 | 2 | -3/+1 |
| | | | | | | | | | | | | performance by 20%) | ||||
| * | | small change wrt to destruction (patch suggested by ogoffart) | Thierry Bastian | 2009-03-31 | 1 | -5/+9 |
| | | | |||||
| * | | add proper support for floats to QVariant | Thierry Bastian | 2009-03-26 | 2 | -7/+21 |
| | | | |||||
| * | | Improved qVariantSetValue by reusing the internals if possible | Thierry Bastian | 2009-03-26 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | This is possible if the type is the same of type < Char (simple types) | ||||
| * | | small simplification in internals of QVariant | Thierry Bastian | 2009-03-26 | 1 | -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 QVariant | Thierry Bastian | 2009-03-26 | 1 | -7/+18 |
| | | | |||||
| * | | Avoids calling function pointer in constructor of QVariant | Thierry Bastian | 2009-03-26 | 1 | -23/+23 |
| | | | | | | | | | | | | Instead, it calls directly the v_construct template function. | ||||
* | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-17 | 2 | -5/+5 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: tests/auto/qpainterpath/tst_qpainterpath.cpp | ||||
| * | | fix reading problem on 64-bit machines in QProcess and socket engine | Peter Hartmann | 2009-04-16 | 2 | -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 Windows | João Abecasis | 2009-04-15 | 1 | -0/+2 |
| | | | | | | | | | | | | Reviewed-by: mariusSO | ||||
| * | | Doc - clarified that on Windows, for 32-bit programs running in WOW64 | Kavindra Devi Palaraja | 2009-04-15 | 1 | -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 Cat | 2009-04-15 | 1 | -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 Macieira | 2009-04-16 | 1 | -11/+6 |
| | | | | | | | | | | | | | | | | | | Just because I can. Reviewed-by: Bradley T. Hughes |