summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-05-072-5/+3
|\ | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/corelib/animation/qabstractanimation.cpp src/corelib/animation/qabstractanimation_p.h src/corelib/animation/qpropertyanimation.cpp
| * update stale docKent Hansen2009-04-291-1/+1
| |
| * rename QBoundEvent to QWrappedEvent and make it publicKent Hansen2009-04-291-1/+1
| | | | | | | | Result of API review.
| * kill StateFinished from docsKent Hansen2009-04-291-1/+0
| |
| * kill StateFinished event type since it doesn't exist anymoreKent Hansen2009-04-281-2/+1
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-053-7/+17
|\ \ | | | | | | | | | kinetic-declarativeui
| * | Deprecate qt_mac_set_show_menubar for a public cross-platform API.Norwegian Rock Cat2009-05-041-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm tired of these "hidden" functions. We have an AA_MacPluginApplication, but sometimes you may have a legitimate reason for setting this outside of "plugin applications." In the footsteps of the menu icon attribute, the attribute is the main leader, but menubars can disable/enable this locally the new QMenuBar::setNativeMenuBar() property. Otherwise, the menubars take their que from the application attribute. This also works for Windows CE. So, there is a bit on convergence as well. Task-number: 236757
| * | prefer macro over stubMaurice Kalinowski2009-05-042-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | - Windows Mobile does the same, thus we will not have double definitions or such - COINIT_MULTITHREADED is the default, meaning that 0 usually expands to it. Just be on the safe side and be more precise. Task-number: 237029 Reviewed-by: joerg
* | | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-041-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 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-285-35/+47
|\ \ \ | |/ / | | | | | | kinetic-declarativeui
| * | Fixed to float support in QVariantThierry Bastian2009-04-271-25/+33
| | | | | | | | | | | | also added autotests
| * | Remove the Direct3D engine.Gunnar Sletta2009-04-241-8/+7
| | |
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-232-2/+6
| |\ \
| | * | Allow QThread to start a QTimer and QEventLoop before QCoreApplication is ↵Bradley T. Hughes2009-04-232-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | 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
* | | | 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.
* | | | Fix merge error.Michael Brasser2009-04-221-4/+30
| | | |
* | | | Merge branch 'kinetic-animations' of ../../qt/kinetic into kinetic-declarativeuiMichael Brasser2009-04-221-0/+3
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | | docKent Hansen2009-04-171-0/+3
| | | |
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-04-178-19/+47
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * | 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
| * | | Initial import of kinetic-animations branch from the old kineticAlexis Menard2009-04-1774-0/+34480
| / / | | | | | | | | | repository to the new repository
* | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-2214-60/+2871
| |/ |/|
* | 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.
| * | Long live Qt!Lars Knoll2009-03-2374-0/+34453
| /
* | 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
* | Merge commit 'origin/4.5'Olivier Goffart2009-04-151-3/+12
|\ \ | |/ | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * Javascript: When there is javascript running then it will spin the CPU at 100%Bradley T. Hughes2009-04-081-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | Zero timers on Windows would continue to fire even after being stopped as long as a new timer was started that reused the pointer address of the zero timer. Fix this by only re-firing zero timers if the zero timer hadn't been stopped (we can check this by looking at the inTimerEvent flag, which is set to false by registerTimer()). Task-number: 247401 Reviewed-by: Denis Dzyubenko Reviewed-by: Prasanth Ullattil
* | The QT_NO_SHAREDMEMORY define was checked a bit too lateRobert Griebl2009-04-071-4/+3
|/ | | | Reviewed-By: Harald Fernengel
* Doc: Added a note about copying by value in QMetaProperty and included ↵David Boddie2009-04-021-3/+15
| | | | | | | | | details about BlockingQueuedConnection in QMetaObject::invokeMethod(). Task-number: 187869 Task-number: 216742 Reviewed-by: Thiago Macieira Reviewed-by: Morten Sørvig
* Subject: Added platform spec. note about type convertionMorten Engvoldsen2009-04-011-0/+8
| | | | | | | | Details: Added a note to the description about using POSIX functions for converting between data types such as floats and strings Task-number: 244600 Reviewed-by: Denis Dzyubenko Reviewed-by: Geir Vattekar
* Doc: Fixed typo.David Boddie2009-03-301-1/+1
| | | | Reviewed-by: TrustMe
* optimizeOswald Buddenhagen2009-03-271-1/+1
| | | | | the exact length of the template is known, so there is no point in using the more complex (and thus potentially slower) strncmp instead of memcmp.
* remove pointless checkOswald Buddenhagen2009-03-271-2/+1
| | | | this function is always called with found != 0 nowadays
* most definitely NOT \since 4.5Oswald Buddenhagen2009-03-271-2/+0
|
* Long live Qt 4.5!Lars Knoll2009-03-2374-0/+34453