| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
qmake/Makefile.unix
qmake/generators/makefile.cpp
src/corelib/global/qglobal.h
src/corelib/kernel/kernel.pri
src/corelib/kernel/qcoreevent.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/kernel/qaction.cpp
src/gui/kernel/qaction.h
src/gui/kernel/qaction_p.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication.h
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget.h
src/gui/kernel/qwidget_mac.mm
src/gui/painting/qgraphicssystemfactory.cpp
src/gui/styles/qwindowsstyle.cpp
src/gui/text/qfontengine_qpf.cpp
src/gui/widgets/qabstractscrollarea_p.h
src/network/access/qnetworkaccessdebugpipebackend.cpp
src/network/socket/qlocalsocket_unix.cpp
src/network/socket/qnativesocketengine_p.h
src/network/socket/qnativesocketengine_unix.cpp
src/openvg/qpaintengine_vg.cpp
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qcssparser/qcssparser.pro
tests/auto/qdir/tst_qdir.cpp
tests/auto/qfile/tst_qfile.cpp
tests/auto/qobject/tst_qobject.cpp
tests/auto/qpathclipper/qpathclipper.pro
tests/auto/qprocess/tst_qprocess.cpp
tests/auto/qsettings/tst_qsettings.cpp
tests/auto/qsharedpointer/qsharedpointer.pro
tests/auto/qsqlquerymodel/qsqlquerymodel.pro
tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
tests/auto/qsqltablemodel/qsqltablemodel.pro
tests/auto/qsqlthread/qsqlthread.pro
tests/auto/qwidget/tst_qwidget.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
- link against correct library
- theoretically it should be ok to use QHostInfo::localHostName(), but
for this test it is fine
Reviewed-by: Thomas Hartmann
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Following QWidget's behavior, you can not assign any item in the
same scene as a focus proxy for another item. Also supports nested
focus proxies. You can only assign items in the same scene as
focus proxies. Autotests are included.
Reviewed-By: mbm
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
the same method was also added to QSslSocket.
previously, it was only possible to ignore all SSL errors; now, it is
also possible to only ignore specific SSL errors, given by a QList of
QSslErrors.
Moreover, it is possible to call this newly added method right after
connecting, not just when we get the SSL error.
Reviewed-by: Thiago
Task-number: 257322
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
got a new certificate, which is self-signed now
Reviewed-by: Thiago
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This removes the need for a "root state" in the machine; or rather,
the machine _is_ the root state.
User code can now pass in a QStateMachine directly to the QState
constructor, instead of machine->rootState().
This also means we could get rid of the "proxying" from the machine
to the root state for things like properties (initialState et al),
finished() signal and auto-reparenting of states (the ChildAdded
event hack).
A fun little side-effect of this change is that it's now possible
to embed state machines within state machines. We can't think of
a good use case yet where you would rather embed a stand-alone
state machine (with its own event processing etc.) rather than
having just a regular nested state, but it's neat and it works.
Reviewed-by: Eskil Abrahamsen Blomfeldt
|
| |\ \
| | |/
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/kernel/qt_cocoa_helpers_mac_p.h
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Regression since my last commit.
Task-number: 152227
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The test for virtual signal did not work.
But we cannot make an error right now or it might break existing code
(exemple in task 210879)
Reviewed-by: Kent Hansen
|
| | |
| | |
| | |
| | |
| | |
| | | |
Unfortunately, I can't do it all inline because the punycode encoding
and decoding requires reading the source several times. (Maybe the
decoding can be done with some effort in the future)
|
| | |
| | |
| | |
| | | |
This will allow to do less allocations in qt_ACE_do.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Made the toPunycodeHelper function write to a QString.
Renamed qt_from_ACE to qt_ACE_do to indicate what it actually
does. Added the STD3 rules for hostnames, forcing hostnames to have to
strictly comply to STD3. Also, execute nameprep in the correct order
(before trying to encode to Punycode).
Validate hostnames when QUrlPrivate::canonicalHost() called, including
validation of IP Literals. Validation of IPv4 is missing.
Adapted other functions to use qt_ACE_do, notably QUrl::toAce (avoid
code duplication).
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
It's not supported because the root state has no ancestor,
which is a requirement for the state machine's transition
selection algorithm.
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
wich can not be stat'ed in a natural way.
FindFirstFile solves this problem.
Task-number: 167099
Task-number: 189202
Merge-request: 880
Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 431
Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
|
| | | |
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp
src/3rdparty/webkit/WebCore/page/DOMWindow.idl
src/corelib/io/qdiriterator.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
tests/auto/qxmlquery/tst_qxmlquery.cpp
tools/linguist/lconvert/main.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Trivial fix. Reported by Michael Brasser.
Task-number: 258337
Reviewed-By: Peter Hartmann
|
| | |
| | |
| | |
| | |
| | | |
- make -input-codec affect PO files, default to UTF-8
- add -output-codec for PO files, same default
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 258230
Reviewed-by: Olivier Goffart
|
| | |
| | |
| | |
| | | |
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | | |
Reviewed-by: thartman
|
| | |
| | |
| | |
| | | |
... by hiding the include from lupdate's view
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This addresses the selection of items using Shift-Arrow or Shift-Click
in QListView's IconMode if the items are in a grid layout. In the case
that the items do not have the same size (e.g., because their text is
wrapped), this commit prevents the unexpected selection of additional
items. New unit tests are included.
Merge-request: 666
Reviewed-by: Olivier Goffart
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We need this to support the behavior in Gtk+ where, when
Qt::ToolButtonTextBesideIcon is used, only text labels
for important actions are shown. It will also enable us to
prioritize actions in the future when for instance collapsing
a toolbar.
Task-number: 258290
Reviewed-by: thierry
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 884
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It was not visible wicause its height was 0
Task-number: 257481
Reviewed-by: mbm
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
KDE and GNOME has the concept of a default tool button style that
can be set system-wide. Qt currently allways default to IconOnly.
I have added an optional Qt::ToolButtonSystemDefault value so you
can opt-in to respect the system setting. We did not change the
default because a lot of apps will look odd when for instance
text is beside icons and the descriptive text is too long.
Task-number: 237864
Reviewed-by: ogoffart
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
terminated by a signal.
The new XML testloggers in Qt 4.6 only output a testlog after the test
completes. Therefore, if a test crashes, no testlog will be output at
all. This is a functional regression from Qt 4.5 and earlier where the
testlog would be output up to the point where the crash occurred.
This is a Unix-specific fix for this problem.
This change is also useful for hanging tests; if the test is killed
with SIGTERM it will output the test log up to the current test before
it exits.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The problem was that we didn't regenerate the bsp when adding
items after calling QGraphicsScene::clear.
Reviewed-by: alexis
|
| | | |
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Several auto-tests failed on the Mac because the view get two paint events on the
first show. This is a bug in QWidget, but shouldn't make graphics view auto-tests
fail. Also, there's no difference between update() and repaint() on the
Mac.
|
| |\ \ \
| | |/ / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This patch includes lots of refactoring, but the real problem was that
in QWidgetPrivate::paintBackground we call drawPrimitive(PE_Widget) with
a potentialy translated painter, but the opt.rect is not translated.
When having a scroll area the calling function used to translated the
painter and then pass the offset around to rectify. but drawPrimitive
cannot rectify it.
The solution is not to translate the painter but use other way to
rectify the brush
Task-number: 257517
Reviewed-by: bnilsen
|
| | | |
| | | |
| | | |
| | | | |
when only setting a border with the stylesheet
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Now that the precisionPolicy stuff is fixed, sql server seems to be
behaving correctly (with double values, but still not with string values).
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Turns out making a binary named `exception' is quite a bad idea...
when some code does `#include <exception>', guess which file gets
picked up :-)
|