summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QDeclarativeDebugClient: Make sure status is consistentKai Koehne2010-09-303-3/+8
| | | | | | | | | When statusChanged() is called during handsake state() was not the same as the argument passed. Fix this by setting gotHello = true _before_ notifying the clients. Reviewed-by: Christiaan Janssen Task-number: QTBUG-14087
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-301142-2030/+2776
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (27 commits) Revert "QDeclarativeDebugService: Add bc autotest" to get changes through staging. Doc clarification. Fallback to A8 text rendering on Mac when LCD smoothing is disabled Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt 4.7.1 Autotest that new "import Qt 4.7"s aren't added accidentally Document "import QtQuick 1.0" change Replace "import Qt 4.7" with "import QtQuick 1.0" Add test for Qt 4.7 module Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Correct property type of PathAttribute::value in the docs. Register QtQuick 1.0 module. Remove unused AST node destructors. Fix crash when trying to append a null transform to QDeclarativeItem. Documentation. Documentation fix for Flickable (mark content properties as real, not int). QDeclarativeDebugClient: Fix gcc warning QmlDebugService: Check that there is a receiver before sending messages If a type is registered under several names, share the attached property object QmlViewer: Fix typo in comment QmlViewer: Fix assert on exit (Windows) ...
| * Revert "QDeclarativeDebugService: Add bc autotest" to get changes through ↵Joona Petrell2010-09-303-95/+2
| | | | | | | | | | | | staging. This reverts commit 31dcf2b4028b1f76301fc69fccff0a9474a0a135.
| * Doc clarification.Michael Brasser2010-09-301-0/+2
| | | | | | | | Task-number: QTBUG-14053
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-292-181/+269
| |\
| | * Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt ↵Joona Petrell2010-09-292-181/+269
| | | | | | | | | | | | 4.7.1
| * | Fallback to A8 text rendering on Mac when LCD smoothing is disabledAaron Kennedy2010-09-291-0/+7
| |/ | | | | | | | | Task-number: QTBUG-14050 Reviewed-by: Eskil Abrahamsen Blomfeldt
| * Autotest that new "import Qt 4.7"s aren't added accidentallyAaron Kennedy2010-09-291-0/+57
| | | | | | | | Task-number: QTBUG-13799
| * Document "import QtQuick 1.0" changeAaron Kennedy2010-09-292-0/+56
| | | | | | | | Task-number: QTBUG-13799
| * Replace "import Qt 4.7" with "import QtQuick 1.0"Aaron Kennedy2010-09-291-1/+1
| | | | | | | | Task-number: QTBUG-13799
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-296-176/+132
| |\
| | * Correct property type of PathAttribute::value in the docs.Michael Brasser2010-09-291-1/+1
| | |
| | * Remove unused AST node destructors.Michael Brasser2010-09-281-146/+3
| | | | | | | | | | | | | | | | | | NodePool does a block free on the memory, so the (empty) destructors are never called, and add lots of noise to code coverage analysis. Added a note in the source about the block freeing.
| | * Fix crash when trying to append a null transform to QDeclarativeItem.Michael Brasser2010-09-283-1/+26
| | | | | | | | | | | | Task-number: QTBUG-13893
| | * Documentation.Michael Brasser2010-09-282-24/+98
| | |
| | * Documentation fix for Flickable (mark content properties as real, not int).Michael Brasser2010-09-281-4/+4
| | |
| * | Add test for Qt 4.7 moduleAaron Kennedy2010-09-295-1/+183
| | | | | | | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
| * | Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-291101-1424/+1424
| | | | | | | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
| * | Register QtQuick 1.0 module.Aaron Kennedy2010-09-295-31/+146
| |/ | | | | | | | | | | | | Qt 4.7 is still supported, but deprecated. Reviewed-by: Martin Jones Task-number: QTBUG-13799
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2828-220/+596
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeDebugClient: Fix gcc warning QmlDebugService: Check that there is a receiver before sending messages If a type is registered under several names, share the attached property object QmlViewer: Fix typo in comment QmlViewer: Fix assert on exit (Windows) QDeclarativeDebugService: Add bc autotest Make QmlDebug protocol more robust Minimize parameter changes on glyph cache textures Only set maskTexture sampler uniform once Only repopulate the glyph cache when we know something could have changed Remove unnecessary attribute changes Invalidate QStaticText coord cache when texture size changes
| | * QDeclarativeDebugClient: Fix gcc warningKai Koehne2010-09-281-1/+1
| | |
| | * QmlDebugService: Check that there is a receiver before sending messagesKai Koehne2010-09-281-2/+4
| | | | | | | | | | | | Reviewed-by: Christiaan Janssen
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-281-1/+4
| | |\
| | | * QmlViewer: Fix typo in commentKai Koehne2010-09-281-1/+1
| | | |
| | | * QmlViewer: Fix assert on exit (Windows)Kai Koehne2010-09-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QApplication object in main() is already destroyed when showWarnings() is called. Create another instance in this case. (Note that the assert will only be triggered for debug builds, while qmlviewer is built in release mode by default). Task-number: QTBUG-14009 Reviewed-by: Thomas Hartmann
| | * | If a type is registered under several names, share the attached property objectAaron Kennedy2010-09-289-10/+62
| | | | | | | | | | | | | | | | Task-number: QTBUG-13799
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-2814-182/+457
| | |\ \ | | | |/
| | | * QDeclarativeDebugService: Add bc autotestKai Koehne2010-09-283-2/+95
| | | | | | | | | | | | | | | | | | | | | | | | Although it's a private header we use qdeclarativedebugservice_p.h in creator / qmljsdebugger library. Working with a copy of the header in the autotest hopefully catches some bc breakages.
| | | * Make QmlDebug protocol more robustKai Koehne2010-09-2812-180/+362
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The protocol so far was client->server only. That is, there was no sane way for a client to check whether a plugin on the server (service) was available or not. E.g. calling Client::setEnabled(true) 'succeeded', without a check whether there is actually a service to talk to. The new protocol replaces this shortcoming by a service discovery mechanism: Both client & service announce their available plugins at handshake time, and later on if there are changes. The status is reflected in Client::status() and Service::Status() , which are either NotConnected - no network connection, or not registered properly Unavailable - TCP/IP connection works, but no plugin with the same name on the other side Enabled - You can connect to plugin on other side The status changes happen automatically (no setEnabled() anymore). Furthermore a version ID was added to the handshake, so that we can extend the protocol further in the future :)
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-2888-509/+1544
| | |\ \ | | | |/
| | * | Minimize parameter changes on glyph cache texturesAaron Kennedy2010-09-283-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache the last set filtering mode on glyph textures and update only when necessary. Reviewed-by: Gunnar Sletta
| | * | Only set maskTexture sampler uniform onceAaron Kennedy2010-09-282-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt always uses the same texture unit as the maskTexture, so it makes sense to set the uniform only once when the program is created. Reviewed-By: Gunnar Sletta
| | * | Only repopulate the glyph cache when we know something could have changedAaron Kennedy2010-09-281-11/+16
| | | | | | | | | | | | | | | | Reviewed-by: Gunnar Sletta
| | * | Remove unnecessary attribute changesAaron Kennedy2010-09-231-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The only consumer of TextDrawingMode is drawCachedGlyphs, and it always sets these two attrib pointers anyway. Reviewed-By: Gunnar Sletta
| | * | Invalidate QStaticText coord cache when texture size changesAaron Kennedy2010-09-231-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If the glyph cache texture changes size, the texture coordinate array must be regenerated to point to the correct texture locations. Reviewed-By: Gunnar Sletta
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-3054-69/+170564
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Add declarative changelog entries for 4.7.1 connman backend My changelog entries for 4.7.1 updated changes-4.7.1 Update frameGeometry when the unified toolbar visiblity is toggled Update changelog my contributions to dist/changes-4.7.1 My 4.7.1 changes. added my and Jan-Arve's change to changelog for 4.7.1 Changes done for 4.7.1 Updated changes-4.7.1 My changes. Fix for bug QTMOBILITY-448 to list the default network configuration in Bearermonitor example Initialise pointer variables. An aborted QNetworkSession on Maemo must emit SessionAbortedError. Autotest: also enable testing of QtDeclarative Add Qt 4.7.0 baseline symbols to the 4.7 branch Call createpackage without the explicit .bat suffix Improve Qt/Symbian compatibility with unix shells Ukrainian translation updated ...
| * | | | Add declarative changelog entries for 4.7.1Joona Petrell2010-09-301-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Yann Bodson
| * | | | connman backendLorn Potter2010-09-301-0/+1
| | | | |
| * | | | My changelog entries for 4.7.1Markus Goetz2010-09-291-0/+4
| | | | |
| * | | | updated changes-4.7.1Joerg Bornemann2010-09-291-0/+12
| | | | |
| * | | | Update frameGeometry when the unified toolbar visiblity is toggledAndy Shaw2010-09-292-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the unified toolbar visiblity was toggled on Carbon then it would not have a correct frameGeometry as it would have a top position different to what it should have been as the window does not move. Autotest included in this commit. Task-number: QTBUG-14055 Reviewed-by: Prasanth
| * | | | Update changelogOlivier Goffart2010-09-291-0/+24
| | | | |
| * | | | my contributions to dist/changes-4.7.1Bradley T. Hughes2010-09-291-1/+7
| | | | |
| * | | | My 4.7.1 changes.Trond Kjernåsen2010-09-291-2/+11
| | | | |
| * | | | added my and Jan-Arve's change to changelog for 4.7.1Thierry Bastian2010-09-291-0/+11
| | | | |
| * | | | Changes done for 4.7.1Prasanth Ullattil2010-09-291-0/+4
| | | | |
| * | | | Updated changes-4.7.1Samuel Rødal2010-09-291-1/+4
| | | | |
| * | | | My changes.Aaron McCarthy2010-09-291-0/+2
| | | | |
| * | | | Fix for bug QTMOBILITY-448 to list the default network configuration in ↵lsgunda2010-09-291-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bearermonitor example Merge-request: 827 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
| * | | | Initialise pointer variables.Aaron McCarthy2010-09-291-2/+2
| | | | |
generated by cgit v0.12 at 2025-09-13 12:42:56 (GMT)