| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
| |
Insufficient heap size was causing containers-sequential and
qgraphicsscene benchmarks to panic in Symbian^1 devices.
Task-number: QTBUG-17725
Reviewed-by: Sami Merila
|
| |
|
|
|
|
|
|
|
|
| |
Due to removal of QScroller and related classes, QtGui DEF files needed
to be updated.
Additionally, there was some new functionality in QDeclarative that
required updation of QtDeclarative DEF-files.
Reviewed-by: Trust Me
|
| |\ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert all QScroller and QFlickGesture related code.
Fix regression that caused waitForXXX(-1) to fail.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commits
0274e68767cce6440515a68d6af868725d5577a4
2770b1277744bb676e96e4ae8c89acd645ec895d
02e1f4e83dc8e3c4ab957095167b3d34c51ba3c1
fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d
d1f9a534da288884f443a975f428b0cfe0a7b29b
205d607c3387d074fb87f8deb77a8f515ae2e189
32d200da9cc7a4dfb3f302f22ef5718a286845c9
3e0df49f978933b1e4e6b48c695bf813ec9a2828
82bbc1c1611bde33680d22a1a3c6449e51d7b0b9
b78ffe51f9a4c4ac705e435d45fffe39864c032d
fe438d7d828021d7f86301af36fe8dff2768532a
df30d58de183d13c649ef7e0fbb8e2b3658e0862
fa845566b3733bc06454b71e33b1ff405ba32280
4f9a318d639c4e7e09e56751d31608fb39d472af
4810b587a65d81f8f90646efd09cadeb1276a756
7bad867382ad6c84155ffcfbb361709a8e8184ab
64ec011c6132496eb9555c1d09e7fd4ddf472837
81492e56aba5b5761500543665012a85d6835513
b668857b3749b39c3a61e0a25e750740b74df552
78a7a02b3b85435bc28eb23e9210522467171e42
Reviewed-By: Ralf Engels
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Regression was introduced by 8d4cd52b6981a4e6deea7fdb77f56e40c4f3e6ba
when it failed to check when msecs == -1. This manifested visibly in KDE
failing to connect to any SSL site -- kioslaves are synchronous and use
waitForXXX(-1) (in this particular case, waitForEncrypted, which calls
waitForReadyRead).
Also, take the opportunity to convert these tests in QTcpSocket to use
port 80 (a defined service in the test server) instead of port 22.
Reviewed-by: Martin Petersson
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
DEFINES statements that define strings needed separate statements for
symbian-sbsv2 builds and Makefile based plaforms, as there is one extra
layer of escaping needed in Makefile builds. Improved compatibility by
making qmake remove one layer of escaping before writing the .mmp MACROs
based on DEFINES.
Note: Symbian-abld builds still do not support string DEFINES as the
toolchain simply can't handle them in .mmp files, no matter how
they are escaped.
Note2: Symbian-sbsv2 support for escaped DEFINES is not perfect either,
as bld.inf files do not like doubly escaped characters in
extension rules (e.g. double-quotation mark as part of a string).
This makes it impossible to pass such DEFINES to extra compilers.
Task-number: QTBUG-19232
Reviewed-by: Oswald Buddenhagen
|
| |/ / |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Allow 'typeinfo <file>' lines in qmldir.
qmlplugindump: Use command line options with a single dash.
qmlplugindump: Allow dumping by path without URI.
Move qmldump from Qt Creator to Qt.
|
| | |\ \
| | | |
| | | |
| | | | |
master-qml-staging
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
Allow 'typeinfo <file>' lines in qmldir.
qmlplugindump: Use command line options with a single dash.
qmlplugindump: Allow dumping by path without URI.
Move qmldump from Qt Creator to Qt.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Also add documentation for that change.
Reviewed-by: Aaron Kennedy
Change-Id: Ifae395bc9b6699c03f9879dcb5407d23a4caab85
(cherry picked from b9839fc1e0e1d98911aef5149a58dd4bdacd8bc1)
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Keep the old -- options for compatibility.
Change-Id: I9c9b0beccc7043cf8b4b654bdba33946abf8c7b6
Task-number: QTBUG-18834
(cherry picked from commit 175382d834142f2a55b4e209af870ab40f741d2d)
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This migrates b980a9b9646a89b5b24efeca40926408a71334de from the
Qt Creator's copy into the qmlplugindump in Qt.
Change-Id: I1ab90f491f5df0e6570aa43a91073e7b332e41df
(cherry picked from commit 9fcece7b455b6540a67780cc3874b230e586b7c4)
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Also rename it to qmlplugindump.
Qmlplugindump is a tool that loads a QML module and prints type
information about the types contained in its plugins to the standard
output.
Reviewed-by: Aaron Kennedy
Change-Id: I7c35c34af23adc1c37453393d71e492dedfc6a9b
(cherry picked from b5265d4e99e5c90532e190632951070cf1a2b630)
|
| |\ \ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
X11: Keep the menubar inside the widgetbox window in toplevel mode
Retain ABI and API compatibility when Qt is built with EGL.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
For now the appmenu protocol does not make it possible to associate a
menubar with all application windows. This means in top level mode you
can only reach the menubar when the widgetbox window is active. Since
this is quite inconvenient, better not use the native menubar in this
configuration and keep the menubar in the widgetbox window.
Merge-request: 1229
Reviewed-by: denis
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Author: Felix Geyer <debfx-pkg@fobos.de>
Merge-request: 1230
Reviewed-by: ossi
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix QtOpenGL def file for armv5.
Disable QtConcurrent for Symbian winscw builds.
Fix loss of focus and activation when hiding a child widget
Symbian build failure for Armv5
Fix softkeys in case a dialog with softkeys that have icons is closed.
Update softkeys after orientation switch.
Provide internal API to avoid automatic translation of input widget
Do not allow fullscreen/maximized windows to expand beyond client rect
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix QtOpenGL def file for armv5.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: TRUSTME
|
| | |\ \ \ \ \ \
| | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (250 commits)
Disable QtConcurrent for Symbian winscw builds.
Fix loss of focus and activation when hiding a child widget
Symbian build failure for Armv5
update def files
Fix softkeys in case a dialog with softkeys that have icons is closed.
Update softkeys after orientation switch.
ifdef out mac/no_coreservices path more cleanly
fix build on symbian
Provide internal API to avoid automatic translation of input widget
Allow different text for undo actions and items in QUndoView
Allow using not only prefixes for undo command text
QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case
Massively update the hurd-g++ mkspec.
Sockets: Fix potential null pointer usages
Update QTBUG-17223 for Qt 4.8
Do not allow multiple threads to acquire a QMutex
rebuild configure
fix tst_qnetworkreply::httpProxyCommands autotest
Send User-Agent from the network request in http proxy CONNECT command
QSslConfiguration documentation fix
...
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
While QtConcurrent is nowadays usable with RVCT and GCCE compilers,
the compiler used for the winscw target has problems with the
templates still. To enable building 4.8 on winscw, the patch
defines QT_NO_CONCURRENT and QT_NO_QFUTURE in qglobal.h for
this target. However this causes further complications in the
Q_OBJECT classes of QtConcurrent because moc will be run without
having QT_NO_CONCURRENT and QFUTURE defined (as moc is not a Symbian
app and for other Symbian targets they must not be defined, which makes
differentiation in qglobal.h impossible for the moc run) and having a
moc file generated for a class that will be ifdef'ed out during
compilation causes build breaks. Therefore additional dummy stubs are
provided in QFutureWatcherBase.
Reviewed-by: Liang Qi
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Don't deactivate the active window when hiding its child if it has
another child that currently has the focus.
Task-number: QTBUG-19196
Reviewed-by: Sami Merila
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
1. Changed externs to Q_GUI_EXPORTs
2. ABSENTed missing exports from openGL's DEF-file
Reviewed-by: Tomi Vihria
|
| | | |\ \ \ \ \
| | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Icons were not cleared from softkeys properly when a dialog with
softkeys that had icons was closed, resulting in having those icons in
softkeys that should have been empty or have text.
Task-number: QTBUG-19154
Reviewed-by: Sami Merila
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This is needed to render the softkeys correctly in case the softkeys
have icons.
Task-number: QTBUG-19150
Reviewed-by: Sami Merila
|
| | | |\ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
There will be cases when client will want to disable splitview
automatic view translation, so that keyboard is just brought on top of
the application and no other actions happen. There will be no new
public Qt GUI API to cover the cases (the public API will come from
QML Components), but the implementation is done with new private API.
Task-number: QTBUG-18716
Reviewed-by: Miikka Heikkinen
|
| | | |\ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Do not allow fullscreen/maximized windows to expand beyond client rect
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Automatic layouting of widgets still managed to layout maximized and
fullscreen windows larger than client rect in Symbian in some cases.
Fixed by limiting window dimensions to client area boundaries in
setGeometry_sys if the window is maximized or fullscreen.
Task-number: QTBUG-5697
Reviewed-by: Sami Merila
|
| |\ \ \ \ \ \ \ \ \
| | |_|_|_|_|/ / /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QmlDebug: Fix QmlOstPlugin compilation failure
QmlDebug: Fix QmlOstPlugin compilation failure
Enable performance monitoring at application startup.
Augment documentation
QmlDebugger: removing slots in Live Preview
QmlDebugger: adding slots to items in Live Preview
Fixed license header
Fixed compile on Windows
Added forgotten file qdeclarativeobserverinterface_p.h
Removed some trailing whitespace
Introduced a CONFIG option that enables declarative debug services
Moved the QML Observer Service and related functionality into Qt
QDeclarativeDebugServer: Send hello answer before any service messages
Removed some superfluous semicolons
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Fix signature of waitForMessage.
Reviewed-by: Tom Sutcliffe
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Implement waitForMessage()/waitForReadyRead functionality required
by bde58ad1e7d2b38d.
Reviewed-by: kkoehne
|
| | |\ \ \ \ \ \ \ \
| | | |_|_|/ / / /
| | |/| | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
src/declarative/debugger/qdeclarativedebugserver.cpp
src/plugins/qmltooling/qmltooling.pro
|
| | | |_|_|_|_|/ /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Michael Brasser
(cherry picked from commit 8765bdaebf5db409dc2121bce3b9838f3663bd7e)
|
| | |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
Augment documentation
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I3469c63207d4ca75c5f942dc3fa84c5a71ceb3a2
Task-number: QTBUG-19112
Reviewed-by: Martin Jones
|
| | |\ \ \ \ \ \ \
| | |/ / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
QmlDebugger: removing slots in Live Preview
QmlDebugger: adding slots to items in Live Preview
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Kai Koehne
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Kai Koehne
|
| | |\ \ \ \ \ \ \
| | |/ / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
Fixed license header
Fixed compile on Windows
Added forgotten file qdeclarativeobserverinterface_p.h
Removed some trailing whitespace
Introduced a CONFIG option that enables declarative debug services
Moved the QML Observer Service and related functionality into Qt
QDeclarativeDebugServer: Send hello answer before any service messages
Removed some superfluous semicolons
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
File added in 35faeb205843c4f0b921d2b878d2d24962c64664
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This compiled fine on Linux, but on Windows the project root is not
automatically included in the INCLUDEPATH. Use the correct relative path
to make the include work.
Problem introduced with 35faeb205843c4f0b921d2b878d2d24962c64664
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This should have been part of 35faeb205843c4f0b921d2b878d2d24962c64664
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This replaces the need for applications to explicitly make a call to
enable the debug services, and rather does it in declarative.h when the
'declarative_debug' CONFIG option is used.
Done-with: Kai Koehne
Change-Id: I817f22a4ec9226a1ee2d080c1f5bb75d8599a06e
Reviewed-by: Martin Jones
Reviewed-by: Michael Brasser
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This code was previously developed as part of Qt Creator in
share/qtcreator/qml/qmljsdebugger/
Moving it into Qt will allow us to simplify the setup required before
you can debug QML applications.
To avoid adding too much weight to the QtDeclarative module, a
declarativeobserver plugin was introduced that contains the
QDeclarativeViewObserver and related classes. The
QDeclarativeObserverService is just a stub service that loads this
plugin once a QML debugging client connects. The plugin implements the
QDeclarativeObserverInterface
A QJSDebugService was separated out of QJSDebuggerAgent, so
that the service can be active while the agent is instantiated lazily.
Each QDeclarativeEngine adds itself to the QJSDebugService. Currently
only the first one is used when instantiating the agent.
QDeclarativeObserverService is hooked into QDeclarativeView, with the
view registering itself to the service, allowing the
QDeclarativeViewObserver to be created for the view once somebody
connects to the service. Again, only the first view is used at the
moment.
Change-Id: Ib50579c6d24361c2b39528e5556410d3446c2e90
Reviewed-by: Martin Jones
Reviewed-by: Michael Brasser
|
