| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
- tr() already returns a QString, duh
- use multi-arg arg() (heh)
|
| |\ |
|
| | |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Martin Jones
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-13178
Reviewed-by: Martin Jones
|
| |\ \
| |/
|/| |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |\ \ |
|
| | | | |
|
| |/ /
| |
| |
| |
| |
| | |
Add selectByMouse: true
Task-number: QTBUG-13024
|
| | |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Trust me
|
| | |
| |
| |
| |
| |
| |
| | |
Invisible areas cause redraw artifacts with OpenVg paint engine.
Task-number:
Reviewed-by: Martin Jones
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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/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
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
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-1:
fix loading of module configs
don't load modules from qt.prf
add comment explaining why this file does magic instead of just voodoo
configure.exe: don't write the QT_NAMESPACE define to .qmake.cache
Don't build bearercloud example if Qt was build w/o SVG support
|
| | | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-12791
Reviewed-by: David Laing
|
| | |/ / /
| | | |
| | | |
| | | |
| | | | |
Print a useful message on error.
Specify the QML url correctly.
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit f13ebf52a0d091c6c72c97d2a13311e1e7c4a5cf.
The given example does not meet the autotest requirements for QML
examples. These involve that it starts without error messages, and that
it follows our naming convention of the start file starting with a
lowercase letter.
Please run the tests/auto/declarative/examples before pushing new
declarative examples. If new examples should be exempted from these
checks, add them to the list of exceptions in that autotest.
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.
Remove useless QString::clear() from QSharedData example snippet.
Move note on connectToBus() not actually being able to reconnect to
Designer: Prevent rich text from being copied into style sheets.
QXmlPatterns QAbstractDateTime: only parse 3 digits of time fraction
qdoc: Removed three unused config variables.
qdoc: Cleaned up the application option specification and use.
Doc: Adding GS QML example files
Doc: Images for QML GS
Doc: Editied version of QML GS
Doc: Adding text to GS page
Fix link error when building Bearer application with Qt Mobility
Doc: nesting up orphant pages
|
| | | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-12633
|
| |\ \ \ \
| | |/ /
| |/| | |
|
| | |/ / |
|
| |/ /
| |
| |
| |
| | |
Reviewed-by: Trust Me
Task-number: QTBUG-12355
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Assistant: Include QML docs
Fixed the curve descriptions and added descriptions for overshoot, amplitude, and period. Fix for QTBUG-7940.
Cocoa: Showing a QFontDialog first shows it in the bottom-left corner
Mac: fix regression from 65a673f that makes some buttons unclickable
Fix deadlocks in ICD and NetworkManager engines.
new icons for cell and bt networks.
Doc: updating getting started docs - not finished
Doc: removing empty links in bread crumb
add convience methods for getting ethernet service details.
fix spelling
fix crash
try harder to get cell name
|
| | | | |
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Assigned valid UID3 for fortuneserver example
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previous UID used by fortuneserver was already assigned
for anomaly demo.
Task-number: QTBUG-12276
Reviewed-by: TrustMe
|
| | | |
| | |
| | |
| | | |
QTBUG-7071 and QTBUG-10173
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Return 'Unknown' bearer type name for unknown bearer type.
Update def files.
Doc: updating index page, x platform and platform spec. Removing redundant style files
Added notice that some links are online documents.
Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)
configure: don't symlink the mkspecs/features directory
Doc: adding changes to getting started and fixing redirection links
doc: Fixed many qdoc errors.
Fixed potential infinite loop in QFileSystemWatcher on Mac.
qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf
Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.
Simplify network manager settings code.
Use an enum to return the bearer type of a network configuration.
Rename QNetworkConfiguration::bearerName() function.
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-12378
Reviewed-by: Alex
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
bearerName() -> bearerTypeName().
bearerName() is deprecated and converted into an inline function which
calls bearerTypeName(). This is required to keep existing code source
compatible between Qt Mobility 1.0.x and Qt 4.7.
Task-number: QTBUG-12378
Reviewed-by: Alex
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-12142
Reviewed-by: Warwick Allison
This patch brings ability to switch QML Viewer's orientation between auto-orientation (=follow sensor),
portrait and landscape orientations (lock orientation) on Symbian. It provides same orientation options as
Qt Creator 2.1's Qt QML Standalone Application creation wizard. Also, menu item rotateOrientation now
works on Symbian, but it's hidden when orientation mode is set to auto-orientation.
Property runtime.orientation has been switched back to supporting four-way orientation on Symbian, previously
it only updated values between portrait and landscape. If your application only supports landscape or portrait
modes, just don't react to the inverted orientations.
Added orientation example screenorientation under examples/declarative.
The patch includes a fix for calculator example, which rotated to wrong direction when switching from portrait
to landscape. Also, improved qdeclarativeviewer unit tests. Changes have been tested to work on Windows,
Linux and Symbian^3.
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix crash on Desktop platforms.
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Missing check for null networkSession.
Task-number: QTBUG-12501
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d521d7d81e8f0297c94be9ebd8af67ee130d0edb )
Workaround for QTBUG-8013: Do not return an ascent of 0
Fix crash when all the items in a QListView are hidden
Removed QEXPECT_FAIL macros from test cases which now pass
Ensure backing store is deleted before top-level window
One more .pro fix for deprecated INCPATH
Fix Rhys' qmake warnings
Fixed QVideoSurfaceFormat::isValid()
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/itemviews/qlistview.cpp
tests/auto/qlistview/tst_qlistview.cpp
tests/auto/qnetworkreply/test/test.pro
tests/auto/qsocks5socketengine/qsocks5socketengine.pro
|
| | | | |
|
| |/ /
| |
| |
| | |
QTBUG-11938 and QTBUG-10801
|
| | |
| |
| |
| | |
Task-number: QTBUG-12493
|
| | |
| |
| |
| | |
Task-number: QTBUG-12469
|
| | | |
|
