| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qsharedmemory_unix.cpp
|
| | |
| |
| |
| | |
Reviewed-By: TrustMe
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
kinetic-animations
Conflicts:
src/corelib/kernel/kernel.pri
src/corelib/kernel/qvariant_p.h
src/corelib/tools/tools.pri
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicswidget.h
src/gui/gui.pro
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Thierry
|
| | | |
| | |
| | |
| | | |
Reviewed-By: Kavindra Palaraja <kavindra.palaraja@nokia.com>
|
| | |\ \ |
|
| | | |\ \
| | | |/ |
|
| | | | |\ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| | | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The .mm file is not read by qdoc for packages other than for the MAC.
This problem is overcome by moving the qdoc comments from the .mm file
to a .qdoc file in doc/src, because all these files are read by qdoc
for each of the packages.
#Task-number: 252566
|
| | | |/
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: 253710
Reviewed-by: Trust Me
|
| | |\ \
| | |/ |
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | | |
Signed-off-by: Andre Haupt <andre@bitwigglers.org>
Reviewed-By: Thiago Macieira
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Usually, "the the" is not proper English
Reviewed-By: Thiago Macieira
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Frederik Schwarzer (1):
typos in docs: double "the"
Merge-request: http://qt.gitorious.org/qt/qt/merge_requests/362
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
|
| | | | | |
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject_p.h
src/network/access/qhttpnetworkconnection.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Adding details about QCloseEvents being acceptet by default in Qt 4 opposed to Qt 3
Task-number: 192607
Rev-by: msorvig
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
if one specify more than one parameter in font-family,
e.g., font-family: Verdana, Arial
Qt should fallback on the second font if the first cannot be found.
QFont::setFamily handle the case when the family name contains a comas,
so we do not need to handle that specially in the css parser code.
Task-number: 252311
Reviewed-by: Thomas Zander
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix the documentation to state sortIndicatorChanged() should be used
and not sectionClicked() for connecting to the sortByColumn() slot as
the sortByColumn() takes two parameters, not one.
Reviewed-by: Kavindra Palaraja
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The example was using deleteAllItems() to delete items from the layout. This method is now part of the QT3_SUPPORT and shold not be used if not needed. Replaced by deleting all items one by one.
Task-number: 220656
Rev-by: janarve
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This commit add a new API to add/find/remove pixmaps into QPixmapCache.
This new extension is based on a key that the cache give you during
the insertion. This key is internally a int which makes all operations
in the cache much more faster that the string approach.
Auto-tests has been extended as well and a benchmark has been added to
compare both approach. I also depecrate the find method for the
string API to have a method pointer based and not reference based like
the Qt policy says.
Reviewed-by: bnilsen
Reviewed-by: andreas
Followed-deeply-by: trond
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
tools/macdeployqt/shared/shared.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Adding the count() function to the example.
Task-number: 220766
Rev-by: Geir Vattekar
|
| | |\ \ \ |
|
| | | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | | |
Conflicts:
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Chaning the sentence to clearify where the iterator points to.
Task-number: 202656
Rev-by: Geir Vattekar
|
| | | | | | |
|
| | | |\ \ \
| | | |/ / |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Small polishing.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Added documentation to the fancy browser example.
Task-number:252097
Rev-by: Geir Vattekar
Rev-by: Ariya Hidayat
|
| | |\ \ \ \
| | |/ / / |
|
| | | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | | |\ \ |
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/painting/qbackingstore.cpp
src/gui/painting/qwindowsurface_raster.cpp
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/gui/kernel/qcocoaview_mac_p.h
src/gui/widgets/qmainwindow.cpp
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Spotted-by: Olivier
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/gui/itemviews/qabstractitemview.cpp
|
| | | |\ \ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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
|
| | | |\ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | | | |
|
| | | |\ \ \ \ \ \ \ \ \ \ |
|
