| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Resources are not allocated on error. Only free on success.
|
| |
|
| |
|
| |
|
|
|
|
| |
Task-number: QT-3150
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
src/plugins/bearer/corewlan/qcorewlanengine.mm
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Four-way merge: take the qt-qml.git#4.7 branch version (which uses
fromUtf8). I used QLatin1String, Thierry used QString::fromLatin1.
Conflicts:
src/declarative/qml/qdeclarativecompiler.cpp
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Inverted sorting arrows on QHeaderViews is intentional on GNOME
Fix compilation for winCE
Revert "Sort indicators displayed incorrectly in GTK style"
Fix warnings in the declarative module
compile fix for mingw (also removes some warnings)
Sort indicators displayed incorrectly in GTK style
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It follows the GNOME HIG as specified in
http://library.gnome.org/devel/hig-book/stable/controls-lists.html.en
Ammending commit reversion fad919fa0fe976facc94685fd1460b4961b72c4e.
Reviewed-by: jbache
Task-number: QTBUG-9299
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 74ce3dea8b3ea06d61cef4e729f6a95f670461fe.
The sorting order is intentional.
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix warnings in the declarative module
compile fix for mingw (also removes some warnings)
Sort indicators displayed incorrectly in GTK style
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Thierry
Task-number: QTBUG-9299
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QElapsedTimer doesn't initialise itself on construction, which means we were
actually depending on uninitialised data. QTime does initialise itself to NullTime.
This means the test didn't actually work if you ran it precisely at midnight...
Reviewed-By: Trust Me
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The NONCLIENTMETRICSW::iPaddedBorderWidth member is supported only on
Windows Vista and above. So when calling the SystemParametersInfo
for SPI_GETNONCLIENTMETRICS on Windows XP, the size for that member
needs to be removed from NONCLIENTMETRICSW::cbSize.
Task-number: QTBUG-8639
Reviewed-by: Thierry
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When QWidget::activateWindow() is called we check if the window was already
mapped and just do not do anything if it wasn't. We used to try to active it
by giving it keyboard focus, but that always fails because it isn't allowed to
call XSetInputFocus on invisible windows, and the error message was swalled by
Qt in the error handler. So now we just don't bother even trying if we know the
call will fail.
Task-number: QTBUG-4042
Reviewed-by: Benjamin Poulain
Reviewed-by: Bradley T. Hughes
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If a window has X11BypassWindowManager hint, we shouldn't bother asking the
windowmanager to active it using the _NET_ACTIVE_WINDOW protocol and just go
though Xorg directly.
Reviewed-by: Bradley T. Hughes
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts commit 555175f9d9e5633b8fcfd6e6f6a11c84faa9946e.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This is a trick we have applied to Qt Creator for a
while and it makes sense to backport this into Qt.
Essentially 1-pixel splitters are unusable at the
moment. With this fix the actual splitter handle
will be 5 pixels wide and slightly overlap neighbouring
widgets. The layout code in QSplitter alreadu use
the contentsRect to support this behavior.
Task-number: QTBUG-9335
Reviewed-by: thierry
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Image size and format is only calculated once on first call
of readJpegHeader. Further private data has been extracted
into QJpegHandlerPrivate.
Unfotunately this change only has very little effect.
Reviewed-by: aavit
Task-number: QTBUG-9091
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This makes it possible to have a prototype object in place that
handles all slot calls, rather than having the slots be recreated
in each wrapper object.
Task-number: QTBUG-3637
Reviewed-by: Simon Hausmann
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Their absence was causing Bauhaus to crash.
Reviewed-by: Simon Hausmann
|
| |/ / / / |
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This widget is treated as a window by Qt, but with the embedded flag ON.
setGeometry should not clip this window, it will be cliped automatically
by the parent view of QMacNativeWidget.
Task-number: QTBUG-9199
Reviewed-by: Denis
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 531
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts commit 0d3c62150f2fa2c06f7676336076be4622059cc3,
which causes the following (intermittent) test failuers:
TESTCASE_FAIL qtconcurrentmap (pulse_qws/linux-x86-g++)
TESTFUNCTION_FAIL qtconcurrentmap::mapped (pulse_qws/linux-x86-g++)
|
| |/ / / / |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This reverts commit 6390248b11b3596d8c946c232e9b0d832dc42941,
which caused the following regressions:
TESTFUNCTION_FAIL qshortcut::ambiguousItems (pulse_linux-g++)
TESTFUNCTION_FAIL qshortcut::ambiguousRotation (pulse_linux-g++)
TESTFUNCTION_FAIL qshortcut::disabledItems (pulse_linux-g++)
TESTFUNCTION_FAIL qshortcut::keypressConsumption (pulse_linux-g++)
TESTFUNCTION_FAIL qshortcut::number (pulse_linux-g++)
TESTFUNCTION_FAIL qshortcut::text (pulse_linux-g++)
TESTFUNCTION_FAIL qshortcut::unicodeCompare (pulse_linux-g++)
|
| |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (119 commits)
Bearer management documentation.
Bearer management changes from Qt Mobility (6fb31d1e).
Remove extraneous semi-colon.
Use the default codec with QString::vsprintf()
Fix build with QT_NO_DOCKWIDGET
Fix the test of QDirIterator with NoDot and NoDotDot
Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDot
QFSFileEngine: don't look through NTFS junctions
After showing modal windows, WM_LBUTTONUP for double click is ignored.
Possible fix for missing QML properties in the qt.qhp file.
Use standard theme icons in Linguist where possible
Use more standard icons from the theme in Assistant
Use more standard icons for standard actions in Designer
Drag & drop operations wont end while using Remote Desktop sessions
_close(fd) closes the associated handle and not the other way around
Fixed locale mapping on Symbian.
Revert change 7bf4512659 on Cocoa.
Extended the high_attributes array, since we have more than 127 widget attributes now.
Added instructions for MinGW users wanting to build the MySQL driver.
Designer: Fix broken resource view.
...
|
| | | | |
| | | | |
| | | | |
| | | | | |
Add overview and examples from Qt Mobility.
|
| | | | |
| | | | |
| | | | |
| | | | | |
6fb31d1e287d7def45c115eb56bcb9b0c5cb3c40.
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QString::vsprintf was not decoding the format string according to QTextCodec::codecForCString,
thus making qDebug("ééé") display improperly, even if using a utf8 terminal, utf8 source files
and a codec for cstrings configured as utf8. Added a unit test.
Merge-request: 530
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (114 commits)
Fix the test of QDirIterator with NoDot and NoDotDot
Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDot
QFSFileEngine: don't look through NTFS junctions
After showing modal windows, WM_LBUTTONUP for double click is ignored.
Possible fix for missing QML properties in the qt.qhp file.
Use standard theme icons in Linguist where possible
Use more standard icons from the theme in Assistant
Use more standard icons for standard actions in Designer
Drag & drop operations wont end while using Remote Desktop sessions
_close(fd) closes the associated handle and not the other way around
Fixed locale mapping on Symbian.
Revert change 7bf4512659 on Cocoa.
Extended the high_attributes array, since we have more than 127 widget attributes now.
Added instructions for MinGW users wanting to build the MySQL driver.
Designer: Fix broken resource view.
Add missing ,.
get rid of build warning messages
Quiet unnecessary configure/qmake warnings when EPOCROOT is not set.
Add configure test for Maemo Internet Connection Daemon.
fix warning
...
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This creates QDir::NoDot and QDir::NoDotDot filters -- in many cases,
one may want the .. entry (e.g. to navigate to the parent directory)
but not the . entry (useless for navigation).
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Starting in 1216161584b730576c24fb128131838be1826b37, we started
processing NTFS junctions as symbolic link.
This reverts isSymlink() behavior back to former behavior and processes
only symbolic junctions. The code path there worked just fine for
directory symbolic links but lead to multiple issues for volume mount
point junctions due to incompleteness.
Task-number: QTBUG-7036, QTBUG-7384
Merge-request: 493
Reviewed-by: João Abecasis <joao@trolltech.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We should not ignore WM_xBUTTONUP messages after WM_xBUTTONDBLCLK. Treat
these messages like WM_xBUTTONDOWN messages.
Task-number: QTBUG-7172
Reviewed-by: Thierry
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The button state passed in the OleDropSource::QueryContinueDrag()
contains wrong information. We need to query the state of individual
buttons like we do in Windows CE.
Task-number: QTBUG-6604
Reviewed-by: Denis
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
... according to the online MSDN documentation.
Hid the cachedFd member in private data under WinCE, since it's never
used there.
Task-number: QTBUG-9085
Reviewed-by: Zeno Albisser
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Changed mapping to map Serbian locale on Symbian to sr_RS locale.
Author: dka
Reviewed-by: dka
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This change adds a workarond where we call show() on the
popup in QCompleter::setPopup. Unfortunately this causes
unnecessary startup delays and popup flicker in Creator.
The original bug reports (254456 and 254460) are not
reproducible on Cocoa.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
attributes now.
Reviewed-by: TrustMe
|
| | | | | |
|