summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-13136-186/+8628
|\ | | | | | | | | Conflicts: src/s60installs/eabi/QtOpenGLu.def
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-05-1317-49/+140
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-05-121-0/+14
| | |\ | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix QtOpenGL def file for armv5.
| | | * Fix QtOpenGL def file for armv5.Laszlo Agocs2011-05-121-0/+14
| | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
| | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-05-12345-3577/+9102
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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 ...
| | | * Disable QtConcurrent for Symbian winscw builds.Laszlo Agocs2011-05-125-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * Fix loss of focus and activation when hiding a child widgetMiikka Heikkinen2011-05-122-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * Symbian build failure for Armv5Sami Merila2011-05-124-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Changed externs to Q_GUI_EXPORTs 2. ABSENTed missing exports from openGL's DEF-file Reviewed-by: Tomi Vihria
| | | * Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-05-1131-121/+1113
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| | | * | Fix softkeys in case a dialog with softkeys that have icons is closed.Miikka Heikkinen2011-05-101-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | Update softkeys after orientation switch.Miikka Heikkinen2011-05-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to render the softkeys correctly in case the softkeys have icons. Task-number: QTBUG-19150 Reviewed-by: Sami Merila
| | | * | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-05-1010-30/+273
| | | |\ \
| | | * | | Provide internal API to avoid automatic translation of input widgetSami Merila2011-05-095-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-05-09298-3396/+7609
| | | |\ \ \
| | * | \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-05-041-7/+9
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Do not allow fullscreen/maximized windows to expand beyond client rect
| | | * | | | Do not allow fullscreen/maximized windows to expand beyond client rectMiikka Heikkinen2011-05-041-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-05-1292-68/+8086
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | QmlDebug: Fix QmlOstPlugin compilation failureKai Koehne2011-05-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix signature of waitForMessage. Reviewed-by: Tom Sutcliffe
| | * | | | | | QmlDebug: Fix QmlOstPlugin compilation failureTom Sutcliffe2011-05-114-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement waitForMessage()/waitForReadyRead functionality required by bde58ad1e7d2b38d. Reviewed-by: kkoehne
| | * | | | | | Merge remote branch 'qt/4.8' into master-qml-stagingKai Koehne2011-05-10916-17352/+69948
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/debugger/qdeclarativedebugserver.cpp src/plugins/qmltooling/qmltooling.pro
| | * | | | | | Enable performance monitoring at application startup.Kai Koehne2011-05-1011-10/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Michael Brasser (cherry picked from commit 8765bdaebf5db409dc2121bce3b9838f3663bd7e)
| | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-05-091-0/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: Augment documentation
| | | * | | | | | Augment documentationAlan Alpert2011-05-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3469c63207d4ca75c5f942dc3fa84c5a71ceb3a2 Task-number: QTBUG-19112 Reviewed-by: Martin Jones
| | * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-05-062-6/+18
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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
| | | * | | | | | QmlDebugger: removing slots in Live PreviewChristiaan Janssen2011-05-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne
| | | * | | | | | QmlDebugger: adding slots to items in Live PreviewChristiaan Janssen2011-05-062-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne
| | * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-05-0578-50/+7883
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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
| | | * | | | | | Fixed license headerThorbjørn Lindeijer2011-05-051-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File added in 35faeb205843c4f0b921d2b878d2d24962c64664
| | | * | | | | | Fixed compile on WindowsThorbjørn Lindeijer2011-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | Added forgotten file qdeclarativeobserverinterface_p.hThorbjørn Lindeijer2011-05-041-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should have been part of 35faeb205843c4f0b921d2b878d2d24962c64664
| | | * | | | | | Removed some trailing whitespaceThorbjørn Lindeijer2011-05-042-22/+22
| | | | | | | | |
| | | * | | | | | Introduced a CONFIG option that enables declarative debug servicesThorbjørn Lindeijer2011-05-045-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | Moved the QML Observer Service and related functionality into QtThorbjørn Lindeijer2011-05-0471-7/+7740
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | QDeclarativeDebugServer: Send hello answer before any service messagesThorbjørn Lindeijer2011-05-021-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary since some services may like to send a message back immediately when its state changes to enabled. Reviewed-by: Kai Koehne
| | | * | | | | | Removed some superfluous semicolonsThorbjørn Lindeijer2011-05-021-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne
| * | | | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2011-05-1119-20/+377
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: Fix GLES2 include path for applications when not using the dash shell Remove not supported qmake api Added Wayland selection support. Added Wayland selection support. Add the wayland client libraries to rpath if we use rpath Fix the wayland windowsurface so that we have stencil and depth buffer Dont do doneCurrent in swapBuffers Lighthouse: Fix up Xlib
| | * | | | | | | | Fix GLES2 include path for applications when not using the dash shellPaul Olav Tvete2011-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backslash escapes normally requires "-e" option to echo Reviewed-by: Jørgen
| | * | | | | | | | Remove not supported qmake apiJørgen Lind2011-05-093-6/+0
| | | | | | | | | |
| | * | | | | | | | Added Wayland selection support.Laszlo Agocs2011-05-095-0/+334
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Messed up when I cherry-picked eb0c2e7229bb3559e6f8754122b298479407c153
| | * | | | | | | | Added Wayland selection support.Laszlo Agocs2011-05-099-3/+33
| | | | | | | | | |
| | * | | | | | | | Add the wayland client libraries to rpath if we use rpathJørgen Lind2011-05-091-0/+4
| | | | | | | | | |
| | * | | | | | | | Fix the wayland windowsurface so that we have stencil and depth bufferJørgen Lind2011-05-091-1/+1
| | | | | | | | | |
| | * | | | | | | | Dont do doneCurrent in swapBuffersJørgen Lind2011-05-051-1/+0
| | | | | | | | | |
| | * | | | | | | | Lighthouse: Fix up XlibJørgen Lind2011-05-055-14/+10
| | | | | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'origin/4.8' into lighthouse-masterJørgen Lind2011-05-04195-2461/+5057
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-05-118-51/+41
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e qmake vc(x)proj generator: support x64 Qt builds qmake: remove dead code from VcxprojGenerator qmake nmake generator: pass MAKEFLAGS to sub-make calls
| | * | | | | | | | | fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76eJoerg Bornemann2011-05-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | | | | | | qmake vc(x)proj generator: support x64 Qt buildsJoerg Bornemann2011-05-062-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17911 Reviewed-by: ossi
| | * | | | | | | | | qmake: remove dead code from VcxprojGeneratorJoerg Bornemann2011-05-062-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ossi
| | * | | | | | | | | qmake nmake generator: pass MAKEFLAGS to sub-make callsJoerg Bornemann2011-05-054-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike other make tools nmake doesn't do this automatically. Reviewed-by: ossi
generated by cgit v0.12 at 2024-11-11 02:03:27 (GMT)