| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
qtconfig can now be fully build without qt3support module. Removed
some legacy and unused code, changed one of labels on widget to reflect
the real meaning of configuration parameter.
Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The widget was redrawn and now makes use of QDialogButtonBox. The
ColorButton's are created more correctly for now. Also, all of the Qt4
ColorRoles are now supported.
All the legacy code was dropped so it must not depend of qt3support.
Some refactoring job also was done and much of unused code was removed.
Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Removed the legacy code and behavior. Now this part of qtconfig doesn't
need the qt3support module to be built.
Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-14281
Reviewed-by: David Boddie
|
|\ \ \ \ \ \
| |/ / / / /
| | | | | /
| |_|_|_|/
|/| | | | |
|
| |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Support device orientation in harmattan
Connect property alias change signals on use
Doc fix.
Fix setting PathView offset when all visible items are removed.
Rename toolbar button.
Update import statement.
Fixes assert in QDeclarativeWebView
Do not show 'More' button when in fullscreen view.
Set reasonable QT_GUI_DRAG_DISTANCE in mkspecs/linux-g++-maemo/qplatformdefs.h
Allow default QApplication::startDragDistance() to be defined in platformdefs.h
Autotest
Ensure the TextInput cursor blinks immediately when enabled.
Fix minehunt execution from QtDemo
Update QtGui def files
Ensure PathView updates positions when path changes.
Create Loader components in correct context
|
| | |/ /
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-14137
Reviewed-by: Aaron Kennedy
|
| | | | |
|
| |_|/
|/| | |
|
|\ \ \
| |/ / |
|
| |\ \
| | |/ |
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (27 commits)
Revert "QDeclarativeDebugService: Add bc autotest" to get changes through staging.
Doc clarification.
Fallback to A8 text rendering on Mac when LCD smoothing is disabled
Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt 4.7.1
Autotest that new "import Qt 4.7"s aren't added accidentally
Document "import QtQuick 1.0" change
Replace "import Qt 4.7" with "import QtQuick 1.0"
Add test for Qt 4.7 module
Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
Correct property type of PathAttribute::value in the docs.
Register QtQuick 1.0 module.
Remove unused AST node destructors.
Fix crash when trying to append a null transform to QDeclarativeItem.
Documentation.
Documentation fix for Flickable (mark content properties as real, not int).
QDeclarativeDebugClient: Fix gcc warning
QmlDebugService: Check that there is a receiver before sending messages
If a type is registered under several names, share the attached property object
QmlViewer: Fix typo in comment
QmlViewer: Fix assert on exit (Windows)
...
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Qt 4.7 is still supported, but deprecated.
Reviewed-by: Martin Jones
Task-number: QTBUG-13799
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QDeclarativeDebugClient: Fix gcc warning
QmlDebugService: Check that there is a receiver before sending messages
If a type is registered under several names, share the attached property object
QmlViewer: Fix typo in comment
QmlViewer: Fix assert on exit (Windows)
QDeclarativeDebugService: Add bc autotest
Make QmlDebug protocol more robust
Minimize parameter changes on glyph cache textures
Only set maskTexture sampler uniform once
Only repopulate the glyph cache when we know something could have changed
Remove unnecessary attribute changes
Invalidate QStaticText coord cache when texture size changes
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The QApplication object in main() is already destroyed when showWarnings()
is called. Create another instance in this case.
(Note that the assert will only be triggered for debug builds, while qmlviewer
is built in release mode by default).
Task-number: QTBUG-14009
Reviewed-by: Thomas Hartmann
|
| |\ \ \ \
| | |/ / / |
|
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-13619
Merge-request: 2486
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |\ \
| | | |/ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In the repository, we should always use the No Commercial license
alongside the GNU Free Documentation License for documentation
files.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Related to the rejected, but valid merge request:
http://qt.gitorious.org/qt/qt/merge_requests/809
|
|\ \ \ \
| |/ / / |
|
| |\ \ \ |
|
| | | | | |
|
| | |\ \ \
| | | |/ /
| | |/| /
| | | |/ |
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Small fixes to Browser.qml
More declarative autotests.
Fix example.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
- focus highlight should not be shown if user presses any physical key, only when up, down, left and right arrow keys are pressed
- hybrid devices (touch + four-way rocker) showed two highlight at the same time after using rocker and pressing the screen with finger
- touch highlight had gradient, focus highlight one didn't
- the width of the focus highlight didn't update when listview changed size (for example after orientation change)
Task-number:
Reviewed-by: Martin Jones
|
| | |\ \ \
| | | |/ / |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is intended to keep the internal documentation out of the
"custom help viewer" use case, where it does not belong.
Reviewed-by: kh1
|
| | | |/ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com>
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: mariusSO
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: danimo
Task-number: QTBUG-13795
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: David Boddie
Task:QTBUG-13786
|
| |/ / |
|