| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
qdoc: Added next and previous links to top of pages.
Doc: style tuning
Doc: fixing style - tool buttons to bold.
Doc: updating the template to support search feature better.
Doc: Fixing columns to display all elements in lists - css3
Doc: fixing bugs in style
Doc: fixing style for search display and slim fit menus
Doc: Fixing bug in sorting script for search results.
Doc: Fixed basic language.
Doc: Added Windows Vista to the trademark list.
Doc: Updated the Java trademark information.
Doc: Moved QFileSystemModel example code to the class documentation.
Doc: Corrected the name property as it was incorrectly declared.
|
| | |
| |
| |
| | |
Task-number: QTBUG-14979
|
| | | |
|
| | | |
|
| |/
|
|
|
| |
as a side effect, the target is now named html-docs instead of docs to
be consistent with the qt docs.
|
| |
|
|
| |
Task-number: QTBUG-14792
|
| |
|
|
|
|
|
|
| |
New mode requires them to at least compile.
Now that I've noticed this, removing that check on compile failures in
QDeclarativeTester.
Task-number: QTBUG-14792
|
| |
|
|
|
|
|
|
|
|
| |
This property can be set with a reason to skip the test (i.e. known bug)
and the failure will not count for blocking purposes.
This change also alters one of the failing tests to use the new property
Task-number: QTBUG-14792
Reviewed-by: Michael Brasser
|
| | |
|
| |
|
|
|
|
|
| |
Moving code from qmeegopixmapdata there.
Merge-request: 2494
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
In meego graphics system remove a redundant check.
Use the real screen size in meegographics surface scaling, not hardcoded one.
Removing glFinish calls in eglSharedImage code. Not needed anymore.
::copy on the QMeeGoPixmapData creates a raster-backed pixmap.
Fixed QGraphicsItem to send ItemScenePositionHasChanged when appropriate
|
| | |
| |
| |
| |
| | |
Merge-request: 864
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |\ \
| |/ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits)
Disable the unified toolbar before entering
QWorkspace: fix hardcoded min size overwriting the real min size
Fix tst_moduleqt47::accidentalImport
tst_qcompleter: Fix the QTBUG_14292_filesystem test on X11
tst_qcompleter.cpp: fix test on mac.
Fixed autotest that was missing focus on Windows
QGraphicsLayoutItem - user set sizes should always override, even if there's a constraint
QGridLayoutEngine - Rework height-for-width support so that row/col spanning works
Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine""
Fixed statement about const_iterator and some whitespace fixes.
Adjust the parent index for the itemsMoved call.
Correctly handle both 16bit and 32bit live pixmaps in meego graphics system.
Correctly remove the egl alpha surface flags in meego graphics system.
Proper dither & proper alpha checking.
In meego graphics system, use always 16bit textures.
QCompleter: do not auto complete when directory is changed.
tst_qcompleter: Add a test for QFileSystemModel
Doc: adjusting the search field width
Doc - remove disclaimer
Added the default format of QTime::toString().
...
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 856
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |\ \ \ \
| |/ / / |
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (55 commits)
Fix autotest failure caused by commit 92365268
Cleanup changelog for 4.7.1.
QNAM: Do not need QNetworkSession for data://
Workaround for QFileSystemWatcher regression
Revert "qmake: pass include directories to MS resource compiler"
Fix User 46 Panic in bearer management on Symbian.
Assistant: Insert all keywords with empty ids, as ids are not mendatory.
qmake: delete .pdb file when making 'distclean' instead of 'clean'
qmake: pass include directories to MS resource compiler
use specified pkg-config
qmake/symbian: Add icons with backslashes in pkg files
Make qtconfig help messages translatable
remove exec bits again ...
Add TIFFClose to QTIffHandler::option() to avoid memory leak
[QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows
Added missing QtWebKit example files and some whitespace fixes.
Added missing native separator transforms.
Doc: tuning search reasult box
qdoc: Don't generate html output for png files.
Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0
...
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Don't call removePath() when it was not added before.
Reviewed-by: con <qtc-committer@nokia.com>
Task-number: QTBUG-14435
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-14393
Reviewed-by: ck
|
| | | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits)
qmake: delete .pdb file when making 'distclean' instead of 'clean'
qmake: pass include directories to MS resource compiler
use specified pkg-config
qmake/symbian: Add icons with backslashes in pkg files
Make qtconfig help messages translatable
remove exec bits again ...
Add TIFFClose to QTIffHandler::option() to avoid memory leak
[QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows
Added missing QtWebKit example files and some whitespace fixes.
Added missing native separator transforms.
Doc: tuning search reasult box
qdoc: Don't generate html output for png files.
Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0
Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize()
Doc: correct spelling
Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp
Doc: correcting grammar on the installation pages
Doc: correcting broken link to labs
Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6
Doc: correcting typo
...
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 851
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (38 commits)
Doc: tuning search reasult box
qdoc: Don't generate html output for png files.
Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0
Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize()
Doc: correct spelling
Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp
Doc: correcting grammar on the installation pages
Doc: correcting broken link to labs
Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6
Doc: correcting typo
Doc: Fixing bug - line too long and not visible. Breaking the line in two
Doc: Fixing typo
Doc: Fixing snippet bug. Path pointing to the wrong snippet
Doc: Fixed doc references to non-existing API
Doc: Fix broken links in QSslConfiguration
Added a project file for the Getting Started with QML and changed the
Clarified the auto connect enumeration regarding which type of
Added installation section and fixed some whitespace.
Doc: Fixing spacing bug in columns
Doc: Fixing bug in QML tutorial
...
|
| | | | | |\ \ |
|
| | | | | |\ \ \ |
|
| | |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
qmlviewer was disappearing if the scene was 0x0. Now it's just unusably
small, which is correct as it will highlight the problem to the
developer.
|
| | |_|_|_|_|/
|/| | | | | |
|
| |\ \ \ \ \ \
| |/ / / / / |
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Task-number: QTBUG-14208
|
| |\ \ \ \ \
| |/ / / / |
|
| | |\ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits)
Live texture updates to meegographicssystem helper.
Live texture updates to meegographicssystem plugin.
Revert the integration of the merge request 2286.
Fix text rendering in GL when using the broken-fbo-fallback
ActiveQt: also make the designer plugin for qaxwidget build in the opensource versions
Fix compilation
Code cleaning with the merge request 2286
Fix a pending issue with the merge request 2286
Doc: fix description of the expected behavior for QGraphicsItem::cursor
Fixed the build error in qtconfig
Resolved a little code style issue in qtconfig
Renamed controls in qtconfig's MainWindow
Removed inheritance from UI file in qtconfig's MainWindow
Fixed a bug and resolved some translation issues in qtconfig
Fixed some problems in qtconfig's PreviewWidget
Removed the inheritance from ui file in qtconfig's PaletteEditorAdvanced
Replaced the unnecessary include with declaration
Resolved some code style issues and fixed the broken copyright year
Finally removed the qtconfig dependency from qt3support
Modified previewwidget's ui file in qtconfig
...
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 848
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The merge request 2286 will be integrated in master.
This should let an angry developer calm down and
resume his work.
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (22 commits)
ActiveQt: also make the designer plugin for qaxwidget build in the opensource versions
Fix compilation
Code cleaning with the merge request 2286
Fix a pending issue with the merge request 2286
Doc: fix description of the expected behavior for QGraphicsItem::cursor
Fixed the build error in qtconfig
Resolved a little code style issue in qtconfig
Renamed controls in qtconfig's MainWindow
Removed inheritance from UI file in qtconfig's MainWindow
Fixed a bug and resolved some translation issues in qtconfig
Fixed some problems in qtconfig's PreviewWidget
Removed the inheritance from ui file in qtconfig's PaletteEditorAdvanced
Replaced the unnecessary include with declaration
Resolved some code style issues and fixed the broken copyright year
Finally removed the qtconfig dependency from qt3support
Modified previewwidget's ui file in qtconfig
Fixed some code style issues in qtconfig
Refactored the MainWindow in qtconfig
Refactored PaletteEditorAdvanced in qtconfig
Removed more legacy code from qtconfig and fixed codestyle issues
...
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
opensource versions
Reviewed-by: Olivier Goffart
Merge-Request: 843
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
after merge request 2286
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The merge request 2286 changes a lot of the QtConfig tool. I took
this opportunity to clean some old style mistake.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
A merge conflict was forgoten in the last update. This patch fixes that.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
qtconfig failed to build with Phonon gstreamer backend turned on
Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
All the controls are ensured to be named according to a Qt Coding Style.
The code is much more readable now. Also, the html code inserts and
tab stops in UI was fixed.
Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
One problem was introduced by the convertion of widget from Qt3:
there is no such field as "text" in QTextEdit.
Also, widget now is not direct ancestor of UI file.
Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The modification is needed to prevent ui compilation time warnings.
Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
