| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/modules.qdoc
examples/assistant/simpletextviewer/findfiledialog.cpp
examples/webkit/fancybrowser/mainwindow.cpp
src/gui/widgets/qtabbar.cpp
src/gui/widgets/qtabbar_p.h
tests/auto/qpixmap/tst_qpixmap.cpp
tools/assistant/compat/helpdialog.cpp
tools/assistant/compat/tabbedbrowser.cpp
translations/translations.pri
|
| |\ |
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
... with several '&'.
Task-number: QTBUG-5667
Reviewed-by: Gabriel
|
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The broadcast receiver should share the port number. In most cases users
won't run the example on a network, but only on one machine. In the case
it simply should work too.
According to our documentation the fix is platform specific, it will
work only on Linux.
Reviewed-by: Peter Hartmann
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Forward declarations outside namespace scope will
fail in this case.
Reviewed-by: brad
|
| | |
| | |
| | |
| | | |
Reviewed-By: Thierry
|
| |\ \
| | |/
| |/|
| | | |
into 4.6
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 2142
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 2142
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| |\ \ \
| | |_|/
| |/| | |
|
| | |\ \
| | | | |
| | | | |
| | | | | |
4.6-staging2
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
ICON keyword can be used without UID, since .mif filename
is generated based on target instead of UID3 nowadays
Task-number: QTBUG-4677
Reviewed-by: Miikka Heikkinen
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This commit basically reverts fa35247d31bd35d72c307f4a6a231400aade0c0.
It can be reverted now since mifconv invoking is changed to use
relative paths instead of absolute one.
Task-number: QTBUG-4745
Reviewed-by: TrustMe
|
| | |\ \ \
| | | |/ /
| | |/| | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fixes commit 9a0f7a1ef
Reviewed-by: Olivier
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The name of the other examples are lowercase. The XML file of Qt Demo
reference a lowercase name.
Reviewed-by: Olivier Goffart
|
| | |_|/
| |/| |
| | | |
| | | | |
Reviewed-by: Bradley T. Hughes
|
| |\ \ \
| | |_|/
| |/| | |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-By: Peter Hartmann
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
configure.exe
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
See QTBUG-5532.
Reviewed-by: Jedrzej Nowacki
|
| |\ \ \ \
| | |_|/ /
| |/| | /
| | | |/
| | |/| |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Commit 3f109fd85cbdc49dc3ef1c14066073079f4e34bf made
QGraphicsShaderEffect private API, however the example showing how to
use it was kept. This patch just removes that example.
Reviewed-by: Samuel
|
| | | |
| | | |
| | | |
| | | | |
Over src/ tools/ examples/ and demos/
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-5528
Reviewed-by: Gabriel
|
| | |\ \
| | | |/
| | |/|
| | | | |
4.6-staging2
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
1) Use QFormLayout instead of QGridLayout
2) Remove Symbian specific size hack
3) Give button box a parent, so that it's buttons get
properly added as the dialog's softkeys.
4) Add submitButton with a positive button role
Task-number: QTBUG-5685
Reviewed-by: Jason Barron
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The current implementation would not show Softkeys as
long as we show a widget via showFullScreen. Therefore,
on Symbian we will for now use showMaximized
Reviewed-By: Jason Barron
|
| |\ \ \
| | |/ / |
|
| | |\ \
| | | |/
| | |/| |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Include QtNetwork as module to work around abld issue of local includes
not working.
Reviewed-by: axis
|
| | | |\ |
|
| | | |\ \ |
|
| | | | |\ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
always use the first non-localhost IP address to listen/connect to, if
there is one.
Reviewed-by: Markus Goetz
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-5742
Reviewed-by: andreas
|
| | | |\ \ \ \ |
|
| | | |\ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
... like all the other examples.
Reviewed-by: Gabriel
Task-number: QTBUG-5533
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Sarah Smith
|
| | | | | | | | | |
|
| | |\ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \
| | | | | |_|_|_|_|/
| | | | |/| | | | | |
|
| | | | | | | | | | |
|
| | | | | | | | | | |
|
| | |\ \ \ \ \ \ \ \
| | | | |_|_|_|/ / /
| | | |/| | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
dist/changes-4.6.0
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: Samuel
|
| | |_|_|/ / / / /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: Part of QTBUG-2455
Reviewed-by: ck
|