summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-1718-37/+37
|\ | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene_p.h
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-1618-37/+37
| |\
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-1618-37/+37
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | rename Qt::WA_AcceptedTouchBeginEvent to Qt::WA_WState_AcceptedTouchBeginEventBradley T. Hughes2009-06-111-1/+1
| | | | | | | | | | | | | | | this is an internal widget state variable, so the name should reflect that (and we shouldn't include it in the docs either)
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-082-0/+4
|\ \ \ | |/ /
| * | handle qreal properties correctly in the meta-object systemKent Hansen2009-06-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cross-compiling, it's possible that the size of qreal for moc itself (host platform) is different from the size of qreal on the target platform. Thus, we should not encode the metatype-id of qreal at moc time. Instead, use QMetaType::QReal in the generated code so that the the property flags are only derived at compile time. We also need to support the pesky QT_COORD_TYPE. In this case, qreal can be _any_ type (not just float or double), so we encode the property type as 0 and have a special check in QMetaProperty::type() that resolves the correct type at runtime. Reviewed-by: Simon Hausmann
| * | Fix for Qt issue #218037 - Add support for the WM_MOUSEHWHEEL message on Windowsminiak2009-06-051-0/+3
| | | | | | | | | | | | | | | Merge-request: 384 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-052-0/+12
|\ \ \ | |/ /
| * | regeneration of qfeatures.hThierry Bastian2009-06-041-0/+5
| | |
| * | add QT_NO_STATEMACHINE define so state machine can be compiled outKent Hansen2009-06-041-0/+7
| | | | | | | | | | | | Reviewed-by: Thierry Bastian
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-293-21/+47
|\ \ \ | |/ /
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-271-12/+37
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| | * qdoc: Indicate that qAbs(T& v) compares v to a 0 of type T.Martin Smith2009-05-261-12/+37
| | | | | | | | | | | | Task-number: 246789
| * | Add a flag that ensure that a connection is made only oneOlivier Goffart2009-05-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is often desirable, when doing connection, to ensure that the same connection is only made once. This can be done with the Qt::UniqueConnection 'flag' Also documented the order the slot are called Reviewed-by: Brad
| * | Mac: Prefix sat in qt.conf is ignored on MacRichard Moe Gustavsen2009-05-261-8/+8
| | | | | | | | | | | | | | | | | | | | | Fix: Make sure to add the prefix to the value we return in QLibraryInfo Task-number: 254545 Reviewed-by: Trenton Schulz
* | | Make Qt::TouchPointState ORable, add Q*TouchEvent::touchPointStates()Bradley T. Hughes2009-05-271-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new function returns a bitwise OR of all the touch point states for the event. This makes it easy to see if a certain type of state is present or not without the need to loop over all touch points. QApplication and QGraphicsScene need to build this state when dispatching the touch points. This also fixes the ASSERT bug that Denis found when trying to send multiple touch presses in a touch begin event.
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-262-2/+10
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.h src/gui/graphicsview/qgraphicsitem_p.h
| * | Added QT_NO_ANIMATION to qfeaturesThierry Bastian2009-05-251-0/+8
| | | | | | | | | | | | | | | Now you can opt it out to save disk space (for embedded). Also tested it and fixed code in state machine.
| * | Fixed 'crazy' warnings about using a string instead of a characterThierry Bastian2009-05-251-2/+2
| | | | | | | | | | | | | | | | | | | | | Wherever I found that we were using a string instead of a single char I fixed the code. Reviewed-by: olivier
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-121-0/+1
|\ \ \ | |/ /
| * | Add a AA_MacDontSwapCtrlAndMeta application attribute.Norwegian Rock Cat2009-05-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to help undo the some magic that is in the Qt/Mac port. Qt automatically flips the Meta and Control keys on Mac. This is a "feature" that makes porting older programs that don't use standard shortcuts easier as Ctrl and Command usually map to the same shortcuts in the application. The upshot of this is that I need to strip the text() out of key events if they contain the Control or Meta modifier. This causes much headache for anyone writing a terminal emulator. Though they would still have to write special code because the keys are swapped anyway. This allows people to write the terminal emulator where hitting the Control key will really send a Control key modifier. We've also done the extra work to ensure that standard shortcuts work correctly regardless of what the value of the attribute is. That is, if you specify QKeySequence::Cut for a shortcut you can always hit Command+X and things will work.
* | | Added Qt::GestureUpdated state for the gesture.Denis Dzyubenko2009-05-111-2/+4
| | | | | | | | | | | | So in total there are three main states - Started, Updated, Finished.
* | | Extended the gesture documentation.Denis Dzyubenko2009-05-111-0/+17
| | | | | | | | | | | | Also made some small fixes that noticed while was writing a doc.
* | | Modifications after the api review by Brad.Denis Dzyubenko2009-05-111-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gesture types are now separated to internal ones, which are listed as enums (though they might be converted to strings internally), and third party gestures which are referenced by strings. From now on QGesture objects derive from QObject, which means third party gesture recognizer developers can use QObjects property system to store custom data inside QGesture without need to subclass it. Some functions were renamed to show their purpose more clear.
* | | Merge of the maemo-gestures branch onto qt/4.5.0Denis Dzyubenko2009-05-111-0/+15
| | | | | | | | | | | | | | | This is a squashed merge of all of the changes in the maemo-gestures branch on-top of the qt/4.5.0 branch.
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-05-042-90/+18
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | Deprecate qt_mac_set_show_menubar for a public cross-platform API.Norwegian Rock Cat2009-05-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge commit 'origin/4.5'Olivier Goffart2009-05-041-90/+17
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/itemviews/qabstractitemview.cpp
| | * Greatly reduced the complexity of the boilerplate function.Thiago Macieira2009-05-041-90/+17
| | | | | | | | | | | | | | | | | | | | | | | | I found out that all I needed to load the proper libraries was to add a string to the ".interp" section of the ELF executable containing the path to ld.so Reviewed-By: Marius Storm-Olsen
| | * Change Qt version number to 4.5.2Thiago Macieira2009-04-241-2/+2
| | | | | | | | | | | | Reviewed-By: TrustMe
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-04-292-1/+12
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | Add qDrawBorderPixmap() function, Qt::TileRules enum, QMargins struct and ↵Marius Bugge Monsen2009-04-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | QTileRules struct. Implements a function to allow drawing CSS3-like border-images (also known as nine-grid images). Next step will be to convert the CSS-style code to use this function for drawing border-images. Task-number: none Reviewed-by: jbache
| * | introduce Q_WS_WINCEMaurice Kalinowski2009-04-291-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 246130 Reviewed-by: joerg Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we decided to stick with Q_WS_WIN32, but having a separate define makes the code more readable. In addition Q_WS_WINCE_WM is available for Windows Mobile only parts, where we do not check for the OS on runtime.
* | | Use a widget attribute to keep track of whether or not TouchBegin has been ↵Bradley T. Hughes2009-04-291-0/+1
| | | | | | | | | | | | accepted
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-04-232-13/+13
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-231-11/+11
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h
| | * 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
| * | Merge branch '4.5'Thiago Macieira2009-04-201-2/+2
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| | * 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 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-04-201-11/+6
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | 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
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-04-162-3/+19
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | Merge commit 'origin/4.5'Olivier Goffart2009-04-151-3/+3
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * Fixes: WDestructiveClose flag and the new WindowCancelButtonHint have the ↵Thomas Hartmann2009-04-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | same value -> crash on SetTitle() Task: 242484 RevBy: mauricek AutoTest: Details: Since we do not respect binary compatibility on Windows CE we just change the enum
| * | Rename qIsFuzzyNull to qFuzzyIsNullBjoern Erik Nilsen2009-04-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function was added in fde7f3d03782c801901f511131458d6fcb1021a5 and we believe qFuzzyIsNull is a better naming and more in line with qFuzzyCompare. Reviewed-by: Lars Knoll Reviewed-by: nrc Reviewed-by: Samuel
| * | Add an internal qIsFuzzyNull(double) methodLars Knoll2009-04-071-0/+16
| | | | | | | | | | | | | | | | | | The method can help to avoid many calls to the rather expensive qFuzzyCompare in the cases where we compare a number against 0 or 1.
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-04-072-17/+31
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-021-4/+4
| |\ \ | | |/
| | * Doc: Trivial fixes.David Boddie2009-04-011-4/+4
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-012-14/+37
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
generated by cgit v0.12 at 2024-10-20 19:39:55 (GMT)