| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/deployment/deployment.qdoc
doc/src/getting-started/installation.qdoc
examples/assistant/simpletextviewer/findfiledialog.cpp
examples/assistant/simpletextviewer/findfiledialog.h
examples/assistant/simpletextviewer/mainwindow.cpp
examples/webkit/fancybrowser/main.cpp
src/corelib/global/qglobal.h
src/gui/dialogs/qfiledialog_win.cpp
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/compat/config.cpp
tools/assistant/compat/config.h
tools/assistant/compat/docuparser.cpp
tools/assistant/compat/docuparser.h
tools/assistant/compat/fontsettingsdialog.cpp
tools/assistant/compat/helpdialog.cpp
tools/assistant/compat/helpdialog.h
tools/assistant/compat/helpdialog.ui
tools/assistant/compat/helpwindow.cpp
tools/assistant/compat/helpwindow.h
tools/assistant/compat/index.cpp
tools/assistant/compat/index.h
tools/assistant/compat/lib/qassistantclient.cpp
tools/assistant/compat/lib/qassistantclient.h
tools/assistant/compat/main.cpp
tools/assistant/compat/mainwindow.cpp
tools/assistant/compat/mainwindow.h
tools/assistant/compat/mainwindow.ui
tools/assistant/compat/profile.cpp
tools/assistant/compat/profile.h
tools/assistant/compat/tabbedbrowser.cpp
tools/assistant/compat/tabbedbrowser.h
tools/assistant/compat/tabbedbrowser.ui
tools/assistant/compat/topicchooser.cpp
tools/assistant/compat/topicchooser.ui
tools/assistant/lib/qhelpsearchquerywidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/assistant/tools/assistant/helpviewer.cpp
tools/linguist/lupdate/main.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Move avkon component transparency check to app initialization.
Fix for symbian dialog background transparency.
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Sami Merila
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
If Avkon components support transparency then dialog background is transparent
enabling rounded corners.
Reviewed-by: Sami Merila
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Assistant docs: Fix link.
QtHelp docs: Fix illegal namespace name.
Assistant: Set correct mime type for text documents.
|
| | | |\ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Assistant docs: Fix link.
QtHelp docs: Fix illegal namespace name.
Assistant: Set correct mime type for text documents.
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-4607
Reviewed-by: David Boddie
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-5908
Reviewed-by: kh1
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-6796
Reviewed-by: kh1
|
| | |\ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QSslSocket: Take better care on how we use the SSL buffers
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f5ca3ba5da63a47d4f90bbd867d3e8453443dd3 )
Revert "Make an empty QUrl also be considered non-detached (d == 0)."
SSL Certificate: don't crash when the END CERTIFICATE line ends without CRLF
doc: Documented the return value for QDomNode::appendChild().
QNAM HTTP: make it give some better error messages in case of socket failure.
qUncompress: Fix terminating \0
Add qttracereplay.exe to gitignore
Fix missing focus rect for check and radio buttons in some GTK+ themes
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
.. and breaking out of a loop where we should.
Reviewed-by: thiago
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
( 8f5ca3ba5da63a47d4f90bbd867d3e8453443dd3 )
Changes in WebKit/qt since the last update:
* Girish: Fix positioning of ComboBox popup in QGraphicsWebView. -- https://bugs.webkit.org/show_bug.cgi?id=33887
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
as agreed with Warwick.
This reverts commit 089ee7094eabb2058b478f5d2f306a69f6c0b3bf.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If the file/data ends in the END CERTIFICATE line without a newline,
the certificate is still valid. If it's followed by anything other
than a newline, then it's no longer valid.
Also add another test for the BEGIN CERTIFICATE ending without
newline, to ensure we don't crash there either.
Reviewed-By: Peter Hartmann
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-By: Peter Hartmann
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: 6666
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: TrustMe
|
| | | |/ /
| | | |
| | | |
| | | | |
Task-number: QTBUG-7498
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Some themes such as Nodoka does not draw a focus rect but instead
reads the focus flag on the widget itself. Hence we have to set
this flag before drawing.
Task-number: QTBUG-7504
Reviewed-by: thorbjorn
|
| | |\ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Update symbian def files
Merge from upstream
Merge from upstream
Fix pro file error affecting windows builds
Merge TRK client changes from upstream (QtCreator)
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Commit 5464cee529a26832517607b764e805bef96ea9f1 changes 3 private class
symbols.
Reviewed-by: Trust Me
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The patch accepted upstream has the signal and slot renamed, so there
is a corresponding change to main.cpp
commit 53c672fb9853fef5a00285213084f02a4253e5f3
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu Jan 21 15:45:40 2010 +0100
trk: Handle TrkNotifyStopped in launcher.
Add signal and static utility functions to parse message.
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
Initial-patch-by: Shane Kearns <shane.kearns@sosco.com>
Task-number: QTBUG-7444
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The patch accepted upstream changed a parameter from QString to
QStringList. So there is a corresponding change to main.cpp to use the
new API.
commit b1291ecfd0ab31c41783feb645c98ce42fa87aae
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu Jan 21 12:33:34 2010 +0100
trk: Add support for command line arguments in trk::Launcher.
Initial-patch-by: Shane Kearns <shane.kearns@sosco.com>
Task-number: QTBUG-7444
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: axis
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
commit 1b77161e7183cdd4b5493698b4cddc727468f0f5
Author: hjk <qtc-committer@nokia.com>
Date: Fri Jan 15 12:01:26 2010 +0100
debugger: clean up verbosity settings in trk adapter
commit 4d7341becac684f5feb908e45d8b1756b4823c20
Author: hjk <qtc-committer@nokia.com>
Date: Wed Jan 13 14:48:29 2010 +0100
debugger: whitespace
commit d3cdfe813444b6afca483c7d13ac80c4c8eda62b
Author: hjk <qtc-committer@nokia.com>
Date: Wed Jan 13 14:46:13 2010 +0100
debugger: add some debug output to trk device
commit 7cd27f2eecd5f77bc35f6b705c6f0422b09e534d
Author: hjk <qtc-committer@nokia.com>
Date: Mon Jan 4 13:17:38 2010 +0100
debugger: add list of thread ids to TRK session state object
Reviewed-by: Shane Kearns
|
| | |\ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
QtHelp: Enable dynamic translation.
Designer: Fixed a crash when previewing in a non-existent style.
uic3: Introduced option to preserve layout object names of Designer 3.
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-7420
Reviewed-by: kh1
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Designer: Fixed a crash when previewing in a non-existent style.
uic3: Introduced option to preserve layout object names of Designer 3.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-7432
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Introduce options flag mask for better handling in UI3Reader. Pass
on layout name.
Task-number: QTBUG-7404
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Initial-patch-by: Andy Shaw <andy.shaw@nokia.com>
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Menubar and dock disappear after hiding a fullscreen widget on Cocoa.
Changelog.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The problem here was exiting the full screen mode. In Cocoa we don't
activate windows as we do in Carbon, therefore we were not exiting from
the full screen mode. This patch adds a check when hiding a window, if
the window is in full screen mode then we go through the list of top
level windows checking if there are any other visible and not-minimized
windows that are also in full screen mode. If none if found, the we exit
the full screen mode.
Task-number: QTBUG-7312
Reviewed-by: Prasanth
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Adding my changes to the changelog for 4.6.1.
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix semitransparent windows with DirectFB
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This filling of the window surface is a bug.
Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
|
| | |\ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: Fixed some earlier incorrect documentation fixes.
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust Me
|
| | |\ \ \ \ \
| | |_|_|/ /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
1st attempt at USB serial port enumerator for linux
Corrected alphabetic order in the docs for events.
Implemented event filter functions for Symbian.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Enumerate the ACM ports which are created in /dev after plugging in the
phone.
Tested on Kubuntu (karmic koala), using 5800XM and N95.
Linux has two USB drivers of interest.
1: CDC-ACM, this loads automatically, and creates /dev/ttyACM<n> for
the USB modem interface
2: USBSERIAL, this needs to be loaded manually using modprobe, and
creates /dev/ttyUSB<n> for each ACM interface on the phone
The second ttyUSB port is the one we need, this enumerator does not
pick the correct port yet. (1st port is ECACM:0, i.e. the modem, 2nd
port is ECACM:1, i.e. the general purpose port used by TRK)
according to lsusb, the 1st ACM descriptor has:
class 2 (comms)
subclass 2 (abstract - modem)
protocol 1 (AT commands)
2nd ACM descriptor has:
class 2 (comms)
subclass 2 (abstract - modem)
protocol 255 (vendor specific)
Linux 2.6.33 RC3 has a hardcoded list of nokia phones in cdc-acm.c for which
the protocol 255 ACM port will be recognised as a second ttyACM
Task-number: QTBUG-7446
Reviewed-by: Miikka Heikkinen
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
RevBy: Trust me
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Previously only the symbian specific event filters were called, but
now all filters in QApplication, QAbstractEventDispatcher and
QInputContext should be called.
Task: QT-2629
RevBy: Jason Barron
Autotest: Passed
|
| | |\ \ \ \ \
| | |_|_|/ /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QGraphicsItem::hasFocus() performance regression.
Fix crashes in QByteArray
Move the labels a bit down so that they align better vertically with the field.
Add command to qmake to do symbian-uid generation
Fixed QBitmap::load to load into bitmap format again.
Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers.
Text drawing is not fast currently
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Problem was that we always climbed the parent chain to look for a panel
item (QGraphicsItem::isActive()) before checking the scene's focus item.
Task-number: QTBUG-6749
Reviewed-by: alexis
|
| | | |\ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
tst_QByteArray is was crashing on linux 64bit.
The memory was freed twice, once by qRealloc, and one by QScopePointer::reset
This patch will leak if qRealloc fails because of OutOfMemory.
But we do not care as it is a corner case.
Reviewed-by: Harald Fernengel
Reviewed-by: Robert Griebl
|
| | | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This was a "showstopper" for QFormLayout being used in Qt Creator.
Task-number: QT-958
Reviewed-by: Michael Goddard
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The UID3 as required by symbian has to be auto-generated when the user
doesn't supply one. To allow this to be done in a mkspec we need a function
to do the hashing. This method adds that.
Reviewed-By: Marius Storm-Olsen
|
| | | |\ \ \ \ |
|
