| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (25 commits)
optimize dynamic call-by-name away
Add support for QtScript connect/disconnect syntax in QML
Minor perf improvement when running QML script blocks
Fix qdeclarative{audio,video} tests.
Don't assume documents are in UTF-8.
Add basic support for explicit newParent in ParentAnimation.
Delete uninspiring example.
Fix compiler warning on RVCT
Use new enum syntax for value types.
Expect fail in currentIndex test for now.
Allow unquoted enum syntax for value types
More declarative examples cleanup.
Improve declarative tabs example.
Fix test leaks
Use _data() for some tests
Add missing NOTIFYs to timer, xmllistmodel, xmlrole
Document new ParentChange properties.
declarative examples cleanup
Fix test
Update QmlChanges.txt
...
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits)
Add support for QtScript connect/disconnect syntax in QML
Minor perf improvement when running QML script blocks
Fix qdeclarative{audio,video} tests.
Don't assume documents are in UTF-8.
Add basic support for explicit newParent in ParentAnimation.
Delete uninspiring example.
Fix compiler warning on RVCT
Use new enum syntax for value types.
Expect fail in currentIndex test for now.
Allow unquoted enum syntax for value types
More declarative examples cleanup.
Improve declarative tabs example.
Fix test leaks
Use _data() for some tests
Add missing NOTIFYs to timer, xmllistmodel, xmlrole
Document new ParentChange properties.
declarative examples cleanup
Fix test
Update QmlChanges.txt
ParentAnimation docs + test.
...
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-8612
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Functions have been added to QML's global Qt object for date/time
formatting. Number formatting will not be supported for 4.7.
Task-number: QT-2821
|
| | | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-8613
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure.exe
examples/multimedia/audioinput/audioinput.cpp
src/corelib/io/qfsfileengine.cpp
src/gui/egl/qegl_wince.cpp
src/gui/egl/qeglproperties.cpp
src/gui/egl/qeglproperties_p.h
src/gui/embedded/directfb.pri
src/gui/kernel/qapplication_win.cpp
src/gui/painting/qdrawutil.cpp
src/opengl/qgl_p.h
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/drivers/odbc/qsql_odbc.h
tests/auto/auto.pro
tests/auto/qgl/tst_qgl.cpp
translations/assistant_adp_ru.ts
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In Symbian, it is now possible to set certain subdirs to be built
only when specified define is true when bld.inf is parsed.
For example, compile a subdir only when building for emulator:
SUBDIRS += winscw_lib
winscw_lib.condition = WINSCW
Also improved SUBDIRS variable documentation; the modifiers were
completely undocumented.
Task-number: QT-3017
Reviewed-by: axis
|
| |\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits)
Doc: Enabled the context menu in the spreadsheet demo.
Updated URLs.
Doc: Applied suggestion for an improvement to the foreach documentation.
Doc: Added a note about the lack of standard file copy/paste on X11.
Doc: Fixed the row number for a widget in two parts of the tutorial.
Doc: Fixed typos.
Reduce compiling time of QScriptValue autotest suite on Windows.
Optimize QScriptValue autotest generator.
Set database write behavior to synchronous=OFF and increase page cache.
doc: Fixed some qdoc errors.
Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text.
Allow building documentation without all of Qt
Added a documentation for the new enum value in gesture api.
Remove the OBJECTS_DIR variable assignment from some projets in Qt.
Fix compile
qmake/MinGw: Link statically for Qt Creator to be able to detect it.
Enable two fast path for blend_tiled_rgb565
Avoid QString reallocation for smallcaps fonts in Itemizer::generate()
Make QLabel::text a reloadable property
remove non wifi interfaces from being handled.
...
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (63 commits)
doc: Fixed some qdoc errors.
Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text.
Allow building documentation without all of Qt
Added a documentation for the new enum value in gesture api.
Remove the OBJECTS_DIR variable assignment from some projets in Qt.
Fix compile
qmake/MinGw: Link statically for Qt Creator to be able to detect it.
Enable two fast path for blend_tiled_rgb565
Avoid QString reallocation for smallcaps fonts in Itemizer::generate()
Make QLabel::text a reloadable property
remove non wifi interfaces from being handled.
Disable auto-uppercasing and predictive text for password line edits.
Avoid QString reallocation in QTextEngine::itemize()
Remove the Qt 4.7 #if guards that were needed for 4.6
Always redraw the complete control when an input event comes in.
Make sure not to crash if createStandardContextMenu() returns 0 (e.g. on Maemo5)
Fix compilation: include QString in order to use QString.
Fix compile
Block the Maemo5 window attribute values from being assigned to something else on other platforms.
be more verbose when warning about incompatible libraries
...
|
| | | | |\ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
added a new make target 'sub-qdoc3' which builds qdoc3 and it's dependencies
only, so that when running "make docs" we don't build all of sub-tools
(including declarative module), but qdoc3 only
Reviewed-by: David Boddie
Reviewed-by: Joao
|
| | | | |/ / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The QtMultimedia module needed to have its
own \page unique name so that the QtMultimedia
\module would not conflict with the QtMultimedia
\namespace.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-6153
Reviewed-by: Trust Me
|
| | |_|_|_|/
|/| | | | |
|
| |\ \ \ \ \
| |_|/ / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (100 commits)
Update QML PropertyAnimation::easing docs
Add testcase for QTBUG-7730
Add autotests for tab and backtab in Keys and KeyNavigation.
Run signal expressions on attached property objects in correct scope
Fixup test
Add support for tab and backtab in KeyNavigation
Mark QGraphicsItem position properties as FINAL
Move the multimedia files to the correct place.
Fix grammar stringifying "on" as "readonly"
Improve grouped property error messages
Don't mess with highlight size if highlightFollowsCurrentItem is false.
Fix ListView contentHeight calculation.
Remove Qt.playSound()
Add formatting functions to QML's global Qt object.
Signal handler requires exactly one value.
QDeclarativeContext::contextProperty() should also access ids
Compile without QVariant::EasingCurve in Qt 4.6.2.
Documented view behavior when items are removed from start of view.
Fix tests failing due to javascript eval errors.
Remove unnecessary additional hash of QDeclarativeGridViewAttached
...
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Use SoundEffect instead.
|
| | | | | |
| | | | |
| | | | |
| | | | | |
The plan is for these to replace DateTimeFormatter.
|
| | | | | | |
|
| | | |/ /
| |/| |
| | | |
| | | | |
Task-number: QT-2807
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: David Boddie <dboddie@trolltech.com>
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-6833
Task-number: QTBUG-937
Reviewed-by: Brad
Reviewed-by: Kent Hansen
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
typo for windows ce exclusion rule
Updated .gitignore with the new name of the qmlviewer
Fixed the close button of the find widget in Assistant
Doc: brief Qt Quick introduction on "What's New" page.
Interview Demo: Fix warning about pixmap leak on X11.
Perform latin1 conversion directly on JSC::UString
Avoid conversion between JavaScriptCore String type and QString
Doc: Rephrase documentation for QColor::isValidColor and add \since 4.7.
Use QList::reserve() in QDataStream>>QList
Added static method isValidColor to QColor.
compile fix with namespaces
build fix for WinCE
qDetectCPUFeatures: compile fix with namespaces
compile fix for WinCE
Mac: using Qt to write plugins disables quit for 3rd party application
doc: Fixed building documentation
Updated syncqt to use relative include paths on cygwin as well.
|
| | |/ / |
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| | |
It's a bit of a waste to have four copies of all of the images. And as
an advanced tutorial throwing in a minor complication like this is
probably beneficial.
Additionally, the background has been replaced by a smaller JPEG
version.
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/declarative/graphicsitems/qdeclarativeevents.cpp
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/qml/qdeclarativescript.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativebehavior.cpp
src/declarative/util/qdeclarativeeasefollow.cpp
src/declarative/util/qdeclarativefontloader.cpp
src/declarative/util/qdeclarativelistmodel.cpp
src/declarative/util/qdeclarativespringfollow.cpp
src/declarative/util/qdeclarativestategroup.cpp
src/declarative/util/qdeclarativesystempalette.cpp
src/declarative/util/qdeclarativetimer.cpp
src/declarative/util/qmlstateoperations.cpp
src/multimedia/qml/qdeclarativeaudio.cpp
src/multimedia/qml/qdeclarativevideo.cpp
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (81 commits)
Added addMMPRules for adding conditional MMP_RULES
Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES
Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f.
Fix for cetest.
Speed up compilation of this test with MSVC.
New benchmark for QDirIterator
Backporting auto-test utility header from master.
Fix a signed/unsigned comparison compiler warning
Removed an export that shouldn't be exported.
Reduced the code and memory footprint of the keymap.
Enabled Qt key events to work also when native key code is missing.
Cleaning of the patch to QTBUG-3168
Patch to QTBUG-3168
Crash in QGraphicsScenePrivate::setFocusItemHelper
Pass the right arguments to QApplication in GraphicsView benchmark.
Improvements to itemview keypad navigation in S60.
Revert changes made in scroll_sys().
Fix SymbianMakefileGenerator::absolutizePath for clean builds
Set the roleNames of proxy models to the roleNames of the source model.
Add benchmarks for accessing meta-object properties via QScriptValue
...
|
| | | |\ \
| | | |/
| | | |
| | | |
| | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Usage:
# Set conditional libraries
LIB.MARM = "LIBRARY myarm.lib"
LIB.WINSCW = "LIBRARY mywinscw.lib"
LIB.default = "LIBRARY mydefault.lib"
# Set conditional Epoc Heap Size
EHZ.WINSCW = "EPOCHEAPSIZE 0x2000 0x2000000"
EHZ.default = "EPOCHEAPSIZE 0x40000 0x400000"
# Add the conditional MMP rules
MYCONDITIONS = MARM WINSCW
MYVARIABLES = LIB EHZ
addMMPRules(MYCONDITIONS, MYVARIABLES)
This will generate the following in the mmp file:
#if defined(MARM)
LIBRARY myarm.lib
EPOCHEAPSIZE 0x40000 0x400000
#elif defined(WINSCW)
LIBRARY mywinscw.lib
EPOCHEAPSIZE 0x2000 0x2000000
#else
LIBRARY mydefault.lib
EPOCHEAPSIZE 0x40000 0x400000
#endif
Task-number: QT-2909
Reviewed-by: axis
|
| | | |\ \
| | | |/
| | | |
| | | |
| | | |
| | | | |
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Make a note about alpha channels and QT_NO_DIRECTFB_IMAGEPROVIDER
Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Add a note about changing top level transparency at runtime.
Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
|
| | | | |
| | | |
| | | |
| | | | |
Task: QTBUG-7766
|
| | | | |
| | | |
| | | |
| | | | |
Task: QTBUG-8033
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tools/qdoc3/cppcodeparser.cpp
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/node.cpp
|
| | | | | |
|
| | | | | |
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeparticles.cpp
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
This reverts commit 327d212f5cff81f1c21b7be5c54b3e1eab4f0ac5.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Could use to be renamed. Possibly to
-QDeclarativeViewGraphicsWidget
-QGraphicsDeclarativeViewWidget (Or QGraphicsD20, in the spirit of i18n)
But those aren't any shorter.
Task-number: QTBUG-7067
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp
tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
QDeclarativeXXX.
|
| | | | | | | |
|
| | | | | | | |
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/declarative/qml/qml.h
|
| | | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
doc/src/declarative/advtutorial1.qdoc
src/declarative/qml/qmlmoduleplugin.cpp
src/declarative/util/qmlxmllistmodel.cpp
|
| | | |\ \ \ \ \ \
| | | |/ / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/declarative/util/qmlanimation.cpp
src/declarative/util/qmlxmllistmodel.cpp
|
