| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (474 commits)
Different version from the previous patch: use QElapsedTimer
Compilation after merge.
Correct last right bearing in boundingBox(glyphs)
Make sure propagated font in QGraphicsWidget can be set on a QPainter
Apparently QPen::brush() can't return a NoBrush for a NoPen.
Updated some URLs and required tools versions for Symbian
Cleanup
Remove pointless \internal docs (that contain no information)
Remove pointless \internal docs (that contain no information)
Internal QML API cleanup
Update example screenshot in doc.
Add a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen.
Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush.
use QFile:map instead of ::mmap
Added support for DEPLOYMENT.pkg_build_version
Do not use global static const references to objects
Autotest: don't use Q_FUNC_INFO for testing which method got called
fix for memory leak in QSysInfo::s60Version()
fix generated makefile dependencies
Cocoa: Demo browser can get stuck after closing modal dialog
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| | |
| | |
| | |
| | | |
Reviewed-by: Janne Koskinen
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Update example screenshot in doc.
Handle layoutChanged() properly in QML views.
Fix ListView and GridView tests following off-by-one fixes.
Revert 4bc81bb1cb3cd4a0a3fe071e00556124e770d7ac
Fix off-by-one at end when views scroll to keep currentItem visible.
Make declarative examples a bit more qt-like.
Add quit buttons to declarative demos
ListView.view and GridView.view properties should not be writable.
Avoid Flickable view jumping when drag threashold is exceeded.
Fix ListView.view attached property with VisualItemModel
Remove dead code.
Add test for VisualItemModel layoutChanged() handling
Remove unused code.
Handle QAbstractItemModel layoutChanged() signal
|
| | | | |
|
| | |\ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (55 commits)
qdoc: Fixed erroneous links to QML basic types.
Fixed item view background color in Gtk style
scope fixes and clutter reduction for sql driver projects
I don't know why some linkers can't call this function, so comment it out.
QNetworkSession::close() method now send closed() signal while faking disconnection.
Add the missing license headers to the QString benchmark data
Fix building of qsimd.cpp on Windows CE
Use QElapsedTimer for the benchlib tests.
Properly implement the CPU feature disabling in qsimd.cpp.
Report the detected CPU features in the corelib boilerplate
Detect CPU features on ARM by reading the ELF auxvec.
Split the CPU-detection code into multiple functions for readability
Fixed delivering gestures to a toplevel widget.
Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result
Don't try to compile the SSE2 and SSSE3 code with compilers that don't support them (e.g. ARM)
Improve on the SSSE3 with alternate aligning function.
Add the beginnings of a new SSSE3-based aligning algorithm
Small fixup
Update the SSSE3-with-alignment function to use aligned loads.
Add an ucstrncmp that uses SSSE3 with aligning.
...
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits)
Use QElapsedTimer for the benchlib tests.
Properly implement the CPU feature disabling in qsimd.cpp.
Report the detected CPU features in the corelib boilerplate
Detect CPU features on ARM by reading the ELF auxvec.
Split the CPU-detection code into multiple functions for readability
Fixed delivering gestures to a toplevel widget.
Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result
Don't try to compile the SSE2 and SSSE3 code with compilers that don't support them (e.g. ARM)
Improve on the SSSE3 with alternate aligning function.
Add the beginnings of a new SSSE3-based aligning algorithm
Small fixup
Update the SSSE3-with-alignment function to use aligned loads.
Add an ucstrncmp that uses SSSE3 with aligning.
Add an SSSE3 version of ucstrncmp
Optimise the tail comparison of ucstrncmp
Add a version of ucstrncmp with SSE2 with aligning.
Add an SSE2-optimised version of ucstrncmp
Add the ucstrncmp benchmarks
Update the data generation script to use a non-including .cpp
Update comments in QString about alignment performance.
...
|
| | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed touch event delivery in QGraphicsView.
let WebKit inject itself into the qt configuration
add indirect input/output specification capability to QMAKE_SUBSTITUTES
Add test that exercises lupdate warnings for QtScript
Make qsTrId() / QT_TRID_NOOP() accessible from QtScript
Make lupdate's QtScript frontend recognize qsTrId() / QT_TRID_NOOP()
Add support for comments and meta-data in the lupdate QtScript frontend
Streamline lupdate's QtScript frontend's error messaging
Doc: linking up orphant files
Doc: Updating menu links
|
| | | | | |\
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed touch event delivery in QGraphicsView.
let WebKit inject itself into the qt configuration
add indirect input/output specification capability to QMAKE_SUBSTITUTES
Add test that exercises lupdate warnings for QtScript
Make qsTrId() / QT_TRID_NOOP() accessible from QtScript
Make lupdate's QtScript frontend recognize qsTrId() / QT_TRID_NOOP()
Add support for comments and meta-data in the lupdate QtScript frontend
Streamline lupdate's QtScript frontend's error messaging
Doc: linking up orphant files
Doc: Updating menu links
|
| | | | | | |\ |
|
| | | | | | | | |
|
|/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Pkg_prerules and pkg_postrules can now be targeted to apply only to
main template pkg, installer pkg, or stub pkg file using
.main, .installer, or .stub suffix on the variable.
Also clarified documentation of these variables.
Task-number: QTBUG-13159
Reviewed-by: axis
|
|\ \ \ \ \ \ \
| |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
src/declarative/qml/qdeclarativexmlhttprequest.cpp
src/opengl/opengl.pro
src/opengl/qgl_p.h
src/plugins/bearer/connman/qconnmanservice_linux.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/assistant/tools/assistant/openpageswidget.h
|
| |/ / / / / |
|
| |\ \ \ \ \
| | |/ / / / |
|
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QString::split has overload, and if you want to take the address of a
function with overload, you need to cast it. If we really wanted to use
QString::split, we would have to do
QFuture<QStringList> future = QtConcurrent::run(string, static_cast<QStringList (QString::*)(const QString &, QString::SplitBehavior, Qt::CaseSensitivity ) const>(&QString::split), QString (", "), QString::KeepEmptyParts, Qt::CaseSensitive);
So use QByteArray::split as an example instead
Task-number: QTBUG-12897
Reviewed-by: David Boddie
|
| | |\ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: update the documentation of NOTIFY signal to reflect reality
|
| | | |/
| | | |
| | | |
| | | | |
Reviewed-by: Thorbjorn
|
| |\ \ \
| | |/ / |
|
| | |\ \
| | | |/
| | |/|
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Move link for Declarative UI Runtime to Using QML with C++ section
|
| | | | |
|
| | | | |
|
| | |/ |
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: Changes to the index page and second level pages linking to the index page.
Use Ctrl rather than Alt for switching tabs in the demo browser
Doc: fixing creator bugs, removing menus and textbox in the header
Update Japanese translations
Ukrainian translation updated
qtconfig and qvfb internationalization fixes
add full width characters to ending() in linguist
QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filter
qdoc: Changed id attribute to be a UUID.
just build connman and networkmanager plugins on linux
|
| | | | |
|
| | | | |
|
| |\ \ \
| | |/ / |
|
| | |/
| | |
| | |
| | |
| | | |
Task-number: QTBUG-8927
Reviewed-by: Alan Alpert
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-13042
|
| | | |
|
| | |
| | |
| | |
| | | |
It must be copied into the appliv=cation bundle automatically.
|
| | |
| | |
| | |
| | | |
Task-nr: QTBUG-11113
|
| |\ \
| | |/ |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
a State (e.g. for setting a transformOrigin for a RotationAnimation).
Also improve some other animation docs in general.
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 775
Reviewed-by: Liang Qi <liang.qi@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In MainWindow::deleteItem, if there is arrow selected, we need to clean
up the items from this arrow. We need to delete them first so there is no
arrow in the list anymore when we calls removeArrows (which before,
deleted arrow that were possibly in the list, resulting in crashes)
Also avoid leak by giving parents to objects that needs it, and destroying items.
Reviewed-by: Geir Vattekar
Task-number: QTBUG-12753
Merge-request: 775
Reviewed-by: Liang Qi <liang.qi@nokia.com>
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/declarative/elements.qdoc
|
| | | |
| | | |
| | | |
| | | | |
...and a set of functional group pages.
|
| | |\ \
| | | |/ |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/index.qdoc
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/getting-started/demos.qdoc
doc/src/getting-started/gettingstartedqml.qdoc
doc/src/index.qdoc
src/declarative/qml/qdeclarativeimageprovider.cpp
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Details: It is not necessary to use entities. In any case, I replaced
them with words for consistency.
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/getting-started/gettingstartedqml.qdoc
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Trust Me
To-be-verified-by: Qt Doc Team
|
| | | | | | | |
|
| |\ \ \ \ \ \
| | |_|_|_|_|/
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
diagramscene example: fix leak and crashes.
|
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
In MainWindow::deleteItem, if there is arrow selected, we need to clean
up the items from this arrow. We need to delete them first so there is no
arrow in the list anymore when we calls removeArrows (which before,
deleted arrow that were possibly in the list, resulting in crashes)
Also avoid leak by giving parents to objects that needs it, and destroying items.
Reviewed-by: Geir Vattekar
Task-number: QTBUG-12753
|
| |/ / / / |
|