| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarativeDebug: Fix cases where multiple packets arrive in one go
Fix js debugging autotest on Windows + Add license header
Rewrite autotests for js debugging
Rename qdeclarativescriptdebugging autotest directory
Create property cache in case of Component{} root
|
| |
| |
| |
| |
| |
| |
| | |
Make sure no packets get 'lost' when they're arriving in one go through
the TCP/IP socket.
Reviewed-by: Christiaan Janssen
|
| |
| |
| |
| |
| | |
Change-Id: I5cb0e53ceab136bfe7c53a3d6c51c8865b76761b
Reviewed-by: kkoehne
|
| |
| |
| |
| |
| | |
Change-Id: I36f969d09d8ce5e0b68b657b514586990e88ebe4
Task-number: QTBUG-19354
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (82 commits)
Doc: Fixed spelling errors that were blocking the CI system.
Added missing license headers.
Added missing license headers.
Doc: Added missing license headers for documentation and examples.
qdoc: Fixed code to match comments in QML files. Fixed API types.
Doc: Speculative attempt to fix build breakage.
Doc: Fixed file name of a header file to use lower case characters.
Doc: Speculative attempt to fix build breakage.
Doc: Fixed file name of a header file to use lower case characters.
Doc: Fixed links.
Doc: Added a snippet to show how to test the Qt version.
Added an additional check to workaround an issue on Windows.
Doc: Fixed a scope test for maemo5 and made an error a warning instead.
converted to unix txt file
try to resolve CRLR problems
"TAB character in non-leading whitespace" fixed
* fixed trailing- and whitespaces
* "How To Learn Qt" is almost complete. Last section is missing * Several external and internal (Qt) web links added
Undo accidental breakage.
Doc: Added some more information about visited links in rich text.
...
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
DEF file updates for Symbian
QTBUG-19883 Adding top level TRAP for QThreads on Symbian
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Undo breakage caused by 3abaecc3aec4e46f1c5969c33875fd45aa542385.
Reviewed-by: Kai Koehne
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Frederik Gladhorn
|
| |\ \ \ \ \ |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-19115
|
| | | | | | | |
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | | |
merge-requests/1220
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-18812
(cherry picked from commit 4e8672c87bd7e740b01ca29a2a3c8ba902ed664b)
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-701
(cherry picked from commit 664408e1046a4d412662b00f5791a9a2b19fde64)
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-18888
(cherry picked from commit 728d4798fa38abf04c682d955abe6325f7599fa0)
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-19225
Reviewed-by: Sami Merila
|
|\ \ \ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Window deactivation in Qt applications when another application such
as task switcher is opened on top of them caused softkeys to display
incorrectly for the duration of Qt application being on the background.
Task-number: QTBUG-19225
Reviewed-by: Sami Merila
|
| | |_|_|_|_|/ /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This reverts commit 38d04b8cd5a26564945b833450a104fe82d97e14.
The above commit was reverted as it caused regression, the problem
described in task QTBUG-6115 was reintroduced.
|
|\ \ \ \ \ \ \ \
| |/ / / / / / / |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Result of sufficient build, remove_freeze freeze cycles to get Qt urel
building cleanly.
|
|\ \ \ \ \ \ \ \
| |/ / / / / / /
| | | | | | / /
| |_|_|_|_|/ /
|/| | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The native Symbian implementation of QThread in Qt4.8 does not have
a top level TRAP, whereas it did in pthreads based implementation in
Qt4.7. This causes an incompatibility in the form of a EUSER-CBASE:66
panic for code that attempts to use the cleanup stack without a TRAP
of its own.
This adds a top level TRAP and std::exception handler to match it and
prints out warning information if they ever trigger to provide some
diagnostic information which would otherwise be lost.
Task-number: QTBUG-19883
Reviewed-by: Laszlo Agocs
|
|\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread"
QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread
Also test http proxy in the QTcpServer benchmark
Symbian QFileSystemWatcher: fix potential crash
Enable QTcpServer benchmark on symbian
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This reverts commit 59f186869c67ab51fccf3aac3153629a1da285b7.
Introduced a race condition - QFileInfoGatherer needs a more invasive
refactor to solve the thread safety problems.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
QFSW isn't thread safe. With removal of the thread inside QFSW,
the addPaths and removePaths must be called from the thread the QFSW
was created in.
Reviewed-by: joao
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
An address on the stack was being passed to an asynchronous API.
This is changed to use the copy of the data on the heap.
Reviewed-by: joao
|
|\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
When asking for relations, don't crash on children that don't return an interface.
Remove more inconsistencies with invisible.
Fix a problem where the video would'nt show on some containers
QAccessibleToolButton::text should return accessibleName if set.
Remove stray semicolon.
|
| |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
interface.
Reviewed-by: Jan-Arve
|
| |\ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Visible status should not influence child count and
other properties.
Reviewed-by: Jan-Arve
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
The problem was linked to the detection of a video stream in the graph.
Only the decoders were tested but the demuxer can directly provide the
video stream.
Reviewed-By: TrustMe
Task-Number: QTBUG-19348
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
This was most likely a copy and paste error.
Reviewed-by: Denis Dzyubenko
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Reviewed-by: TrustMe
|
|\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Revert "Fix compilation of lrelease on Windows"
Fix compilation of lrelease on Windows
Allow selecting fonts with irregular style names
Fix missing empty lines in Qt HTML when displayed in compliant browsers
Protect against deleted windows
|
| |\ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|/ / / / / /
| | |/| | | | | | | | | |
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Fonts like "Helvetica Neue UltraLight" or "Skia Regular Black
Condensed" can't be selected in Qt because either they don't
report correct numeric values for weight/stretch/etc. or these
values are not mapped from QFont enums in a linear way. Thus
we provide a shortcut to select these fonts with PostScript
name or full name without resorting to family name matching in
QFontDatabase (these fonts are not registered in font database
anyway). After this, we can simply use:
QFont font("Helvetica Neue");
font.setStyleName("UltraLight");
to select these fonts. QCoreTextFontEngineMulti matched like
this can be created directly from the CTFontRef instance
instead of creating from the font name, making this process
faster.
The commit also cleaned up the font loading process in Mac
font database a bit, moving the code for family matching into
a separate function.
Add QFontInfo::styleName() and QRawFont::styleName() to access
the resolved style name for a font.
Task-number: QTBUG-19366
Change-Id: Iad07768c02ed06cc8d6b7395dec554384f410506
Reviewed-on: http://codereview.qt.nokia.com/333
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
(cherry picked from commit 97391be5ebddc62545ddb88f92fc2045bfa10711)
|