| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add support for -runtimegraphicssystem configure option
runonphone - catch ctrl-c and terminate remote process before exit
Skipped rcomp check on Raptor.
Fix package header in cases where VERSION doesn't contain all values
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It has been requested that we provide a configuration option to specify
the default "inner" graphics system that should be used when the
runtime graphics system is in use. The argument specified to the option
is written to the qconfig.h as QT_DEFAULT_RUNTIME_SYSTEM and this is
used to instantiate the default graphics system that will be used by
the runtime graphics system.
Reviewed-by: Gunnar Sletta
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Trap SIGINT, SIGTERM, SIGHUP, SIGBREAK, SIGQUIT
On receiving one of these signals, we first untrap them (so runonphone
can be killed by a 2nd ctrl-c if needed), and send a terminate to the
TRK launcher.
This will kill the remote process if it's running, then disconnect from
TRK cleanly.
Task-number: QTBUG-12444
Reviewed-by: axis
|
| |
| |
| |
| |
| |
| |
| | |
This is necessary in the case where Qt is built as part of the
platform, where configure will run before all the tools are built.
RevBy: Thomas Zander
|
| |
| |
| |
| |
| |
| |
| |
| | |
Missing minor or patch value from VERSION caused malformed pkg header
to be generated.
Task-number: QTBUG-12617
Reviewed-by: axis
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Make SpringAnimation usable inside a transition
Don't crash if an item is removed from the scene while it is gaining focus.
Add missing snippet file
Snake game cannot be restarted
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
SpringFollow was turned into SpringAnimation so it could be
used inside a Behavior. This patch completes the work and makes
it usable inside a transition.
This is the documented behavior of SpringAnimation, the patch
is essential to make SpringAnimation work consistently.
Reviewed-by: Michael Brasser
Task-number: QTBUG-12141
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't crash if an item is removed from the scene while it is gaining focus.
Add missing snippet file
Snake game cannot be restarted
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-12628
|
| | | | |
| | | | |
| | | | |
| | | | | |
Task-id: QT-3668
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If the item is removed from the scene in response to the FocusOut event
of the previous item don't continue attempting to set focus.
Task-number: QTBUG-12620
Reviewed-by: Michael Brasser
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Assistant: Include QML docs
Fixed the curve descriptions and added descriptions for overshoot, amplitude, and period. Fix for QTBUG-7940.
Cocoa: Showing a QFontDialog first shows it in the bottom-left corner
Mac: fix regression from 65a673f that makes some buttons unclickable
Fix deadlocks in ICD and NetworkManager engines.
new icons for cell and bt networks.
Doc: updating getting started docs - not finished
Doc: removing empty links in bread crumb
add convience methods for getting ethernet service details.
fix spelling
fix crash
try harder to get cell name
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Surprisingly, the QML documentation is not integrated into the Qt docs,
so it has to be explicitly included.
Task-number: QTBUG-12625
Reviewed-by: kh1
|
| |\ \ \ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The reason it does this, is because we set up a parent child relationship
on the dialog. And when doing so, Cocoa shows the dialog. So we need
to delay setting up this until after we have set the dialog geometry
Task-number: QTBUG-9198
Reviewed-by: prasanth
|
| |/ / / / /
| | | | | |
| | | | | |
| | | | | | |
amplitude, and period. Fix for QTBUG-7940.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If a button has a small gemoetry, the mac style will reender it as
flat. Change 65a673f did not take this logic into account when
massaging the hit rect of the button. This patch will.
Task-number: QTBUG-10401
Reviewed-by: cduclos
|
| |\ \ \ \ \ |
|
| | | | | | | |
|
| | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/plugins/bearer/connman/qconnmanengine.cpp
|
| | | |\ \ \ \ \ |
|
| | | | |\ \ \ \ \ |
|
| | | | | | | | | | |
|
| | | | | | | | | | |
|
| | |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | |
|
| | | | | | | | | | | |
|
| | | | | | | | | | | |
|
| | |\ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | | |
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Ensure that locks are not held when signals are emitted.
Task-number: QTBUG-12631
|
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add the qt_ prefix to convert_rgb888_to_rgb32_ssse3
Update changes-4.7.0
Use the fast conversion from RGB888 to RGB32 for Jpeg images
Move the SIMD defines to the common declaration of Qt symbols
Fixed: QT_DEPRECATED_WARNINGS defines QT3_SUPPORT
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Exported function needs to have the qt_ prefix.
Beviewed-by: Olivier Goffart
Reviewed-by: Andreas Kling
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Reviewed-by: Simon Hausmann
|
| |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Use the fast conversion from RGB888 to RGB32 for Jpeg images
Move the SIMD defines to the common declaration of Qt symbols
Fixed: QT_DEPRECATED_WARNINGS defines QT3_SUPPORT
|
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
The commit 90642dd2b6b14c39cc6178f1161331895809b342 introduce a fast
way to convert from RGB888 to RGB32 with SSSE3.
This patch uses that function to do the color conversion when decoding
jpeg images.
The #defines for the SIMD extension have been moved to the common code
in order to be able to compile the jpeg handler directly in QtGui or
as a plugin.
Reviewed-by: Andreas Kling
|
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Move the #defines for the SIMD extension to the common code
in order to be able to use them from any module without copying their
definition.
Reviewed-by: Andreas Kling
|
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Task-number: QTBUG-1043
Reviewed-by: Thorbjorn
|
|\ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|/ / /
|/| | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Assigned valid UID3 for fortuneserver example
|
| |/ / / / / / / / / / /
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Previous UID used by fortuneserver was already assigned
for anomaly demo.
Task-number: QTBUG-12276
Reviewed-by: TrustMe
|
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|/ / / / / / / / /
|/| | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Phonon; Use correct Phonon version numbers.
|
| |\ \ \ \ \ \ \ \ \ \ \
|/ / / / / / / / / / / /
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Phonon; Use correct Phonon version numbers.
|
| | |/ / / / / / / / /
| |/| | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Task-number: QTBUG-12627
Reviewed-by: Andrew den Exter
|
|\ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|/ / /
|/| | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to d6aa024c84f61d0602bef4eef84efaed7cfeefcc
|
| | |/ / / / / / / /
| |/| | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Integrated changes:
|| <https://webkit.org/b/36723> || Crash while uploading a PDF document on www.largefilesasap.com ||
|| <https://webkit.org/b/40572> || [Qt] Stack overflow when converting navigator object to QVariant ||
|| <https://webkit.org/b/43037> || [Qt] Incorrect input method hints ||
|
|\ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / /
|/| | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits)
Removed the unfinished sentence. Fix for QTBUG-10173.
Fixed the addressbook tutorial and some spelling mistakes. Fix for QTBUG-7071 and QTBUG-10173
Unbreak QImage::rgbSwapped() for many image formats.
Crash when pressing the '£' key on Belgian Keyboard layout (Cocoa)
Doc: Adding content to installation guide and fixing printing bugs
Cocoa: Active QDockWidget does not stay on top of inactive QDockWidget
Made changes to qdoc to allow it to accept a "style level" flag
Doc: Correcting bugs in the CSS
Return 'Unknown' bearer type name for unknown bearer type.
Update def files.
Doc: updating index page, x platform and platform spec. Removing redundant style files
Added notice that some links are online documents.
Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)
configure: don't symlink the mkspecs/features directory
Doc: adding changes to getting started and fixing redirection links
doc: Fixed many qdoc errors.
Fixed potential infinite loop in QFileSystemWatcher on Mac.
qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf
Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.
...
|
| | | | | | | | | | |
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
QTBUG-7071 and QTBUG-10173
|
| |\ \ \ \ \ \ \ \ \ |
|