| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |\
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Allow enum values to be used as signal parameters
ListModel::clear() should not clear roles
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The fix does not work for enums declared outside of the class that
emits the signal, since in this case it is not possible to access
the metaobject of the class that declared the enum. However the
fix makes a special case for the Qt namespace to allow enums in this
namespace to be used.
Task-number: QTBUG-15983
Change-Id: I6f72255b07010311a20fe068bd97c7db7b294d9b
Reviewed-by: Aaron Kennedy
|
| | |
| |
| |
| | |
Task-number: QTBUG-8078
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/dynamicobjects.qdoc
doc/src/declarative/elements.qdoc
doc/src/examples/qml-examples.qdoc
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
fixes/improvements for new QML right-to-left docs
Fix license headers in example code
Write Qt Quick 1.1 right-to-left documentation and examples
Doc fix - QtQuick 1.1 scheduling
|
| | | |
| | |
| | |
| | | |
Clarify some of the docs and fix some broken doc links.
|
| | | |
| | |
| | |
| | | |
Change-Id: I510caf92c2e33df2bb44d87cc07fe78a0823ab5f
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-11042
Reviewed-by: Martin Jones
Change-Id: I6319992dec52a4d9252c2df39801ebe6a7dee75d
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (46 commits)
Fix the license info for bin/elf2e32_qtwrapper.pl.
Avoid panics in QDesktopWidget on Symbian emulator.
QS60Style: use placeholder texture when polishing widgets and palette
Regression: QS60Style: Theme background is incorrect
Remove changes from fix to QTBUG-17045 that were not related to the fix
Prevent null pointer crash when closing splitview
QS60Style slows down layout switch by updating widgets unnecessarily
Fix qgraphicstransform autotest for Symbian, where qreal is float.
Removed reference to nonexistant profile.
Disable capabilities example for symbian-gcce due to a bug in elf2e32
Readded a ';;' that was removed by mistake.
Fixed mkspec detection for Symbian.
Removed javascript-jit from default symbian-gcce build.
Corrected a mismerge in GCCE link parameters.
Fixed incorrect referral to an include file.
Fixed win32-msvc2008 build regression.
Made qmake strip trailing \ from libdirs.
Fixed GCCE libdir handling if the paths have spaces in them.
Added MinGW support for adding lib prefix and extension via profile.
Added support for various special compiler/linker flags on MinGW.
...
|
| | | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This was done for a number of reasons:
- In order to get better consistency with the other mkspecs, which
have the target system name followed by a hyphen and the compiler
name.
- There is no real reason why we should have specific mkspecs for
compiling Symbian under Linux, when it is equally likely to work
under other operating systems.
RevBy: Thomas Zander
Conflicts:
src/s60main/s60main.pro
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
RTL text-related tests were failing on mac since
QApplication::keyboardInputDirection() is not always initialized
when the QApplication instance is created.
Change-Id: Ifa7214ffb1941d824a9425015b38aa77366381bb
Reviewed-by: Martin Jones
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativelistview.cpp
Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Ensure attributes added in QtQuick 1.1 are marked with the
'\since QtQuick 1.1' tag. Also add links to items listed in the
QtQuick 1.1 section in whatsnew.qdoc.
Task-number: QTBUG-17771
Change-Id: Ic8fb3c8d3c99a1469c1767779efaafd27ef460e1
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-17280
Reviewed-by: Martin Jones
Change-Id: I34a623b49ce0fd5c05ae7a7ea5d0437c107b8a9b
|
| |\ \ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Can't use Q_OBJECT without inheriting from QObject.
Reviewed-by: David Boddie
|
| |/ / / / |
|
| | | | | |
|
| |\ \ \ \ |
|
| | |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | | |
merge-requests/1108
Conflicts:
doc/src/declarative/basictypes.qdoc
|
| | | |\ \ \
| | | | |/
| | | |/|
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Remove sqlite3.sis from qt.sis.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Nokia Content Signing doesn't like embedded sis packages, so
remove the embedded sqlite3.sis from qt.sis. It must now be installed
separately just like Open C packages.
Task-number: QTBUG-17399
Reviewed-by: axis
|
| |/ / / /
| | | |
| | | |
| | | | |
Task-number: QTBUG-17556
|
| |\ \ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Some text were wrapped, therefore failing regression tests.
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-17303
|
| | |/ / / /
|/| | | |
| | | | |
| | | | | |
Task-number: QTBUG-13451
|
| | | | | | |
|
| | | | | | |
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into 4.7
Conflicts:
doc/src/declarative/extending.qdoc
doc/src/external-resources.qdoc
doc/src/overviews.qdoc
src/declarative/util/qdeclarativeview.cpp
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-16071
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-16071
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-16071
|
| | |\ \ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-16071
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-16071
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-16071
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Added snippet code, and replaced the text.
Task-number: QTBUG-16071
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-16071
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-16071
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-16071
|
| | |\ \ \ \ \ \ \
| | | |_|_|/ / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
doc/src/declarative/propertybinding.qdoc
src/declarative/util/qdeclarativeview.cpp
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: David Boddie
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Removed unneeded snippets and added new snippet code.
Task-number: QTBUG-16071
Reviewed-by: David Boddie
|
| | |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
doc/src/declarative/extending.qdoc
doc/src/external-resources.qdoc
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativetransition.cpp
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Fixing a merge conflict.
Conflicts:
doc/src/overviews.qdoc
|