| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Implement support for DEPLOYMENT.display_name in Symbian
Added .flags modifier support for DEPLOYMENT items in Symbian
Make default application deployment removable
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The default package name and the default name that appears in
the application menu is derived from the TARGET variable.
Often the default is not optimal for displaying to end user.
To set a better display name for these purposes DEPLOYMENT.display_name
variable can now be used.
Task-number: QTBUG-14280
Reviewed-by: Janne Anttila
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The .flags modifier can be used to specify pkg flags for files.
For example, to make default application run after install:
default_bin_deployment.flags += FR RI
For example, to show a note at installation time:
notedep.sources = install_note.txt
notedep.flags = FT TC
DEPLOYMENT += notedep
See Symbian package file format documentation for exact supported
flag values.
Task-number: QTBUG-13367
Reviewed-by: Janne Anttila
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Default application deployment was hard coded in qmake, so it was
impossible to replace with custom deployment. Now the default deployment
is generated via .prf files and is removable.
Task-number: QTBUG-13367
Reviewed-by: axis
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msbuild_objectmodel.h
qmake/generators/win32/msvc_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/arch/qatomic_arm.h
tests/auto/qglthreads/tst_qglthreads.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits)
qmake: Include -pthread when reducing duplicate library arguments
qmake: Ensure right library order when reducing duplicate libraries
rebuild configure.exe
make QMAKE_POST_LINK handling in nmake generator sane
make custom command handling in vc(x)proj files sane
Revert "QWorkspace: fix hardcoded min size overwriting the real min size"
QtScript/JavaScriptCore: Backport random number generator seeding fix
Fix performance regression in QUuid::createUuid()
Update japanese translations.
Ensure that the underline is only drawn when expected for an accel
Small improvement in the textedit demo
My changes for 4.7.1
QWorkspace: fix hardcoded min size overwriting the real min size
Doc: Fixing link titles and error color in search results
Doc: Implementing features to the search feature.
Setting the _NET_WM_STATE Atom only when its not already set
Fix focus appearance of tabwidget tabs with QGtkStyle
Incorrect selection background for unfocused widgets with GTK
Make the OpenSSL library search also hit /lib.
Update change log.
...
|
| | | |\ |
|
| | | | |\ |
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Adding search to narrow/slim fit mode
|
| | | | |\ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Removing search results from menus and including them in a floating dialog div element
|
| | | | |\ \ \ |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | |\ \ \ \
| | | | |/ / / |
|
| | | | | |\ \ \ |
|
| | | | | | |\ \ \ |
|
| | | | | | | | | | |
|
| | | | | | |/ / /
| | | | |/| | | |
|
| | | | | |/ / /
| | | |/| | | |
|
| |\ \ \ \ \ \ \
| |/ / / / / / |
|
| | |\ \ \ \ \ \
| | |/ / / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Improve test coverage for declarative module.
Avoid potential null dereference.
Add autotest for reserved words in QML.
Prevent crash in XmlListModel when appending an empty role.
Remove unused, unexported class.
Fix clipping behavior for non-cached text.
Compile
Only cache textlayout in paint engines that support transformations
QmlDebugService: Fix compiler warning about cast from ascii
Qt.openUrlExternally should resolve relative URLs.
Doc: add missing image.
Doc: typographical and spelling errors.
Doc: remove unfinished and confusing mention to focus panels.
Apply the QStaticText text-caching strategy for QML
Documentation: input to Qt.rgba should be from 0-1, not 0-255.
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | |_|_|/
| | |/| | | |
|
| | |\ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (24 commits)
Stabilize tst_QGraphicsWidget::QT_BUG_13865_doublePaintWhenAddingASubItem
Fixed accessing freed memory in raster engine.
Build fix for -qtnamespace.
Fixed parsing of SVGs with absolute font sizes.
Moving QPdf::stripSpecialCharacter to fontengine
Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"
Fixed a layout issue where you could get NaN as dimensions
QTextCodec: Fix valgrind warning when using QTextCodec in destructions functions
Fix double painting when adding an item into a linear layout
Fixed antialiased rasterization bug in raster engine.
Fixed potential crash when loading corrupt GIFs.
Work around an ATI driver problem with mutli-sampled pbuffers.
tst_qstatemachine.cpp: fix compilation with Sun Studio
Fixed regression in clipping.qps autotest on 64-bit.
Fixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac.
Fixed performance regression in curve stroking.
Don't disable texture_from_pixmap on GLX/X11 by default.
Avoid creating copy of an image in memory when storing as png
Doc update for the support of MSVC 2010 64-bit
fix documentation of drawText(int, int, int, int, ...
...
|
| | | |\ \ \ \
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (24 commits)
Stabilize tst_QGraphicsWidget::QT_BUG_13865_doublePaintWhenAddingASubItem
Fixed accessing freed memory in raster engine.
Build fix for -qtnamespace.
Fixed parsing of SVGs with absolute font sizes.
Moving QPdf::stripSpecialCharacter to fontengine
Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"
Fixed a layout issue where you could get NaN as dimensions
QTextCodec: Fix valgrind warning when using QTextCodec in destructions functions
Fix double painting when adding an item into a linear layout
Fixed antialiased rasterization bug in raster engine.
Fixed potential crash when loading corrupt GIFs.
Work around an ATI driver problem with mutli-sampled pbuffers.
tst_qstatemachine.cpp: fix compilation with Sun Studio
Fixed regression in clipping.qps autotest on 64-bit.
Fixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac.
Fixed performance regression in curve stroking.
Don't disable texture_from_pixmap on GLX/X11 by default.
Avoid creating copy of an image in memory when storing as png
Doc update for the support of MSVC 2010 64-bit
fix documentation of drawText(int, int, int, int, ...
...
|
| |\ \ \ \ \ \
| | |_|/ / /
| |/| | | | |
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QTextCodec: Fix valgrind warning when using QTextCodec in destructions functions
Fix double painting when adding an item into a linear layout
Fixed antialiased rasterization bug in raster engine.
Fixed potential crash when loading corrupt GIFs.
Work around an ATI driver problem with mutli-sampled pbuffers.
tst_qstatemachine.cpp: fix compilation with Sun Studio
Fixed regression in clipping.qps autotest on 64-bit.
Fixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac.
Fixed performance regression in curve stroking.
Don't disable texture_from_pixmap on GLX/X11 by default.
Avoid creating copy of an image in memory when storing as png
Doc update for the support of MSVC 2010 64-bit
fix documentation of drawText(int, int, int, int, ...
Optimization of pixel conversion when storing jpeg
Don't pretend to support single buffered EGL surfaces.
Named anonymous struct in the OpenGL paint engine.
Fixes gray_raster incorrectly reporting out of memory error.
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed potential crash when loading corrupt GIFs.
Work around an ATI driver problem with mutli-sampled pbuffers.
tst_qstatemachine.cpp: fix compilation with Sun Studio
Fixed regression in clipping.qps autotest on 64-bit.
Fixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac.
Fixed performance regression in curve stroking.
Don't disable texture_from_pixmap on GLX/X11 by default.
Avoid creating copy of an image in memory when storing as png
Doc update for the support of MSVC 2010 64-bit
fix documentation of drawText(int, int, int, int, ...
Optimization of pixel conversion when storing jpeg
Don't pretend to support single buffered EGL surfaces.
Named anonymous struct in the OpenGL paint engine.
Fixes gray_raster incorrectly reporting out of memory error.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
MS has released a hotfix for the support of MSVC 2010 64-bit.
It fixes the optimizer that could generate code that crashes.
Reviewed-by: Trust-Me
Task-number: QTBUG-11445
|
| |\ \ \ \ \ \ \ \
| | |_|_|/ / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
doc/src/snippets/code/doc_src_qmake-manual.qdoc
src/corelib/arch/symbian/arch.pri
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
|
| | |\ \ \ \ \ \ \
| | |_|_|_|/ / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (31 commits)
QDeclarativeDebug: Make autotests more robust
Add sendParentChangeNotification to QGraphicsItem
Use setParentItem() instead of setParentItemHelper if componentComplete is true
QDeclarativeDebugClient: Make sure status is consistent
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
...
|
| | | |\ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* '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
|
| | | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
|
| | |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Make target "unsigned_installer_sis" can now be used to create
unsigned smart installer sis. The contained application sis
will also be unsigned.
Task-number: QTBUG-13902
Reviewed-by: axis
|
| | |\ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QFontMetrics::lineWidth() for fonts with defined point size
Implemeting, exporting and autotesting QFont::lastResortFont()
Fixed compile error on non-Symbian platforms.
Fixed regression when typing in QTextControl based widgets on Symbian
Fixed incorrect snippet in BLD_INF_RULES documentation
Streamlined smart installer package creation
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-13988
Reviewed-by: TrustMe
|
| | | |_|/
| |/| |
| | | |
| | | | |
(cherry picked from commit a21b6be2e97b2678111930bc04eaa843b42fa22b)
|
| | | | | |
|
| | |\ \ \
| | |/ /
| | | /
| | |/
| |/| |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-3171
Reviewed-by: David Boddie
|
| | |\ \ |
|
| | | | | |
|
| | |/ /
| | |
| | |
| | |
| | | |
Task-number: QTBUG-2210
Reviewed-by: David Boddie
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/painting/qrasterizer.cpp
src/network/access/qnetworkaccessmanager.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/assistant/tools/assistant/mainwindow.cpp
|
| | |/
| |
| |
| |
| |
| |
| | |
Many things have changed with QML debugging in Qt Creator. Now docs
simply refer to Qt Creator documentation.
Reviewed-by: Leena Miettinen
|
