| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (55 commits)
Revert "Removed double setting of _WIN32_WINNT"
Revert "removed a few warnings on wince builds"
removed a few warnings on wince builds
Removed double setting of _WIN32_WINNT
QTreeView: remove dead code.
doc: Clarify effect of QFont::NoFontMerging
Revert "Implement heightForWidth support for QTabWidget and QStackedLayout."
build fix for S60
Improve handling of QAction in soft key manager
Remove useless assert
qdrawhelper: fix optim in 2245641ba
QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage
accelerate QWindowsPipeWriter for bigger chunks of data
Fix antialiasing with transformed text in OpenGL2 paint engine
Fix flattening of largely scaled, thin, dashed beziers.
Increased the precision used to flatten beziers
Fix QT_NO_MOVIE
Fix compile error with QT_NO_ACTION in QtGui
Fix QT_NO_COMPLETER
Fix QT_NO_FSCOMPLETER
...
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (53 commits)
removed a few warnings on wince builds
Removed double setting of _WIN32_WINNT
QTreeView: remove dead code.
doc: Clarify effect of QFont::NoFontMerging
Revert "Implement heightForWidth support for QTabWidget and QStackedLayout."
build fix for S60
Improve handling of QAction in soft key manager
Remove useless assert
qdrawhelper: fix optim in 2245641ba
QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage
accelerate QWindowsPipeWriter for bigger chunks of data
Fix antialiasing with transformed text in OpenGL2 paint engine
Fix flattening of largely scaled, thin, dashed beziers.
Increased the precision used to flatten beziers
Fix QT_NO_MOVIE
Fix compile error with QT_NO_ACTION in QtGui
Fix QT_NO_COMPLETER
Fix QT_NO_FSCOMPLETER
Fix QT_NO_FILESYSTEMMODEL
Build fix
...
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (48 commits)
build fix for S60
Improve handling of QAction in soft key manager
Remove useless assert
qdrawhelper: fix optim in 2245641ba
QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage
accelerate QWindowsPipeWriter for bigger chunks of data
Fix antialiasing with transformed text in OpenGL2 paint engine
Fix flattening of largely scaled, thin, dashed beziers.
Increased the precision used to flatten beziers
Fix QT_NO_MOVIE
Fix compile error with QT_NO_ACTION in QtGui
Fix QT_NO_COMPLETER
Fix QT_NO_FSCOMPLETER
Fix QT_NO_FILESYSTEMMODEL
Build fix
Safeguard ourselves against corrupt registry values for cleartype gamma
fix cetest build properly
qdrawhelper: optimize the fetch transformed bilinear functions
Compile fix for WinCE
Make sure the selectionChanged signal is not called too much
...
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Commit f5b19c173109c53bf3d8167573f7276cf39262d2 broke the build for
cetest. Reverting my initial naive attempt to fix this
bd5d323373dbaf9d827126b77895da253128c1e5.
We're introducing a new define for building qmake without generators.
QT_QMAKE_PARSER_ONLY is used for cetest and the qmake COM wrapper of
the Visual Studio Add-in.
Reviewed-by: ossi
|
| | | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/3rdparty/phonon/ds9/mediaobject.cpp
|
| | | | | | | |
|
| | | | | | | |
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Revert change 07c347f54 from 4.6.
Implement some changes to the AIX xlC mkspec suggested by IBM.
Fixed app freeze if switching to offline in middle of HTTP transaction.
Document Symbian platform security requirements on Qt APIs
Fixed app freeze if switching to offline in middle of HTTP transaction.
CSS: fixes border only affecting the first widget.
Removed QtDeclarative.dll deployment from qt.iby in 4.6 branch.
fix closing state in QLocalSocket on Windows
Fix segfault, if QPixmap::loadFromData() fails
Don't build QtXmlPatterns' command line tools on Symbian.
|
| | | |\ \ \ \ \
| | | |_|/ / /
| | |/| | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Brought up by Espen.
Reviewed-by: Espen Riskedal
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fix writing duplicate headers' properties in designer.
Fix dealing with the default dynamic properties of string type.
Use unifiedToolBarOnMac, by default don't show some tool action.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Designer has written verticalHeaderVisible property in ui file twice:
once done implicitly while saving the fake properties and
once done explicitly inside QDesignerResource by calling
saveWidget(QTableView/QTreeView). The latter is removed as
it is redundant now.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Task-number: QTBUG-9351
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Fixed showing, changing and resetting of default dynamic properties
of string and keysequence type.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Task-number: QTBUG-9603
|
| | | | |_|_|_|/
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Some tool actions are hidden by default (undo/redo, cut.copy.paste),
the user can bring them back by using View|Toolbars|Configure Toolbars
dialog.
Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Removed the 'Screen' element from DeclarativeViewer, as it was used only
for the orientation property. Now access the 'orientation' property like this:
'runtime.orientation' and the enum is accessed as 'Orientation.Landscape',
when using the qmlruntime.
Updated docs for qmlruntime.
Reviewed-by: Martin Jones
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The 'runtime' property is a singleton object that contains various info
about the execution environment for the qml application. Currently
it contains just one property 'isActiveWindow', which tells if the
window of the declarative viewer is active or not.
Task-number: QTBUG-8902
Reviewed-by: Martin Jones
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number:
Reviewed-by: Martin Jones
|
| |/ / / / / / |
|
| |\ \ \ \ \ \
| |_|_|_|/ /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix qmake.pro after Symbian alternate build system integration
Fix compile error
Don't try to use so much permissions, use something a lot more sane
A bit saner suggestion
Remove not needed permissions
Make compile on Symbian
|
| | |/ / / / |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Written-by: kh1
Reviewed-by: ck
|
| | | | | | |
|
| |\ \ \ \ \ |
|
| | |\ \ \ \ \
| | |_|/ / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits)
Revert Merge Request 551. This introduces regressions to Qt.
Fixed scroll area size calculation on Mac.
Fix a race where QThread::exit() is "lost" when called after start()
make a partial build of linguist in no-gui config
make the code less of a trap
fix build from top level
Partially revert MR 543 changes to Linguist.
Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.
Autotest: add some debugging, just in case there's something wrong
Autotest: fix the fix for the rounding error.
Fix compile error with QT_NO_LIBRARY in QtMultimedia
the _setmode() prototype is different on win ce
qdoc: Changed qdoc to output the new doc format.
Doc: update 'developing on mac'
fcntl.h doesn't seem to exist, either - contrary to an example on msdn
Autotest: fix paths on the test server after update.
Force the repaint during a window resize.
fix compile on wince
remove CONFIG += ordered again
Assistant: Check namespace and virtual folder syntax of help projects.
...
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
it's not very wise to use += first, and then to overwrite everything
with =. use proper scoping instead.
Reviewed-by: joerg
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Whatever this is doing, it breaks the build on Windows CE/Mobile. This
has stopped oslo-staging-1 from integrating for over a week now.
Not reviewed. This patch is a blind attempt at fixing the issue.
|
| | |\ \ \ \ \
| | |_|/ / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (130 commits)
Warning
Read Maemo orientation at startup
Exclude gestures from examples autotest
Exclude proxywidgets from examples autotest
Fix crash on QScriptProgram destruction
doc fixes
Start documenting coding conventions
Adds missing qml file to qdeclarativeflipable autotest
Revert "Better reporting of extension plugin loading errors."
Doc
Fix graphicswidget auto-test.
Add Mac OS X bundle description for qml runtime
Cleanup
Disallow writes to read-only value type properties
Allow undefined to be assigned to QVariant properties
Add a Qt.isQtObject() method
Fix crash in QML library imports
Remove QT_VERSION checks in QML
List properties aren't read-only
Small doc fix.
...
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
QT-2695
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Also, it's now Qml.app instead of qml.app. An icon is still missing.
Reviewed-by: con
|
| | | | | | | |
|
| | | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
In shadow build environments, we cannot enforce that shared
library objects for plugins are located in the same directory
as the qmldir file. This makes it hard for Creator to support
mixed projects (qml/c++).
In order to gain more flexibility, the patch introduces a
pluginPathList to QDeclarativeEngine, which completes the existing
importsPathList.
The pluginPathList defaults to ["."], which indicates the directory
where the qmldir file is located in.
The qml viewer tool gains a command line option -P to add to the
pluginPathList.
For consistency, the -L option ("Library") has been renamed to
-I ("Import"). QDeclarativeEngine::importExtension() has been
renamed to QDeclarativeEngine::importPlugin().
The documentation has been adjusted accordingly.
Done with erikv.
Reviewed-by: erikv
|
| | |_|/ /
|/| | |
| | | |
| | | | |
This feature is not complete in this commit.
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits)
Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.
Autotest: add some debugging, just in case there's something wrong
Autotest: fix the fix for the rounding error.
Fix compile error with QT_NO_LIBRARY in QtMultimedia
the _setmode() prototype is different on win ce
qdoc: Changed qdoc to output the new doc format.
Doc: update 'developing on mac'
fcntl.h doesn't seem to exist, either - contrary to an example on msdn
Autotest: fix paths on the test server after update.
Force the repaint during a window resize.
fix compile on wince
remove CONFIG += ordered again
Assistant: Check namespace and virtual folder syntax of help projects.
QtHelp: Fix auto tests.
Fix a crash when unloading libQtCore
Introduce a qconfig feature for QtDBus
Fix build after MR 543 merged.
Compile on 10.4.
revert "Fix the Qt build on Mac OS X/Cocoa 64-bit"
Remove expected failures after JavaScriptCore bug fix
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Ossi is right: on WinCE, _setmode is different from regular Windows
and the docs...
Reviewed-by: ossi
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
... both from windows and the wince doc ...
Reviewed-by: joerg
|
| | |\ \ \ |
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: joerg
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-4519
Reviewed-by: kh1
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
qmlviewer is now called simply qml, and the debugger is not in Qt
sources anymore.
Reviewed-by: Bradley T. Hughes
|
| | |/ / /
| | | |
| | | |
| | | | |
Very cool.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This adds a -no-gui switch to configure, allowing to build Qt without
QtGui and components depending on QtGui.
This is useful on headless servers, and in using QtCore, QtNetwork,
QtXml, QtSql etc. on platforms QtGui hasn't been ported to yet.
Task-number: QTBUG-4007
Merge-request: 543
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-9651
Reviewed-by: ck
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Coming soon!
Task: QTBUG-9504
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Coming soon!
Task: QTBUG-9504
|
| | |/ /
| | |
| | |
| | | |
Task: QTBUG-9504
|
