summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Setting the _NET_WM_STATE Atom only when its not already setDominik Holland2010-10-011-7/+14
| | | | | Task: QT-3918 Reviewed By: Bradley T. Hughes
* Fix focus appearance of tabwidget tabs with QGtkStyleJens Bache-Wiig2010-10-011-4/+7
| | | | | | | | | There was an issue with ubuntu Ambience theme since it requires a custom tab style. This was not currently supported by QGtkStyle. Task-number: QTBUG-14161 Reviewed-by: thorbjorn
* Incorrect selection background for unfocused widgets with GTKJens Bache-Wiig2010-10-011-3/+15
| | | | | | | | | | | In Ubuntu 10.10 the unfocused selection background is different from the focused one. Interestingly they use GTK_STATE_ACTIVE for unfocused widgets. This was verified back to GTK 2.10 which is the required minimum for QGtkStyle so it should be safe for all other styles as well. Task-number: QTBUG-13792 Reviewed-by: thorbjorn
* Make the OpenSSL library search also hit /lib.Thiago Macieira2010-10-011-1/+1
| | | | | Task-number: http://bugs.meego.com/show_bug.cgi?id=7777 Reviewed-by: Markus Goetz
* Update change log.Andrew den Exter2010-10-011-1/+5
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-301144-2042/+2831
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (31 commits) QDeclarativeDebug: Make autotests more robust Add sendParentChangeNotification to QGraphicsItem Use setParentItem() instead of setParentItemHelper if componentComplete is true QDeclarativeDebugClient: Make sure status is consistent 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 ...
| * QDeclarativeDebug: Make autotests more robustKai Koehne2010-09-304-13/+14
| | | | | | | | | | | | | | Always flush sockets after sending data, and make autotests more robust by using busy wait. Reviewed-by: Christiaan Janssen
| * Add sendParentChangeNotification to QGraphicsItemMarco Bubke2010-09-302-4/+16
| | | | | | | | | | | | | | Fixes crash in creator. If flag is true notifications are sent. It is important that positioners work correctly and don't leak. Reviewed-By: Alexis Menard
| * Use setParentItem() instead of setParentItemHelper if componentComplete is trueMarco Bubke2010-09-302-9/+34
| | | | | | | | | | | | | | | | | | | | This ensures that if the component has already been completed, itemChange() is called. This is required to modify QDeclarativePositions in the visual editor, while keeping a legal state. Without this patch notifications are missing and the Positioner keeps track of already deleted children. This resulted in a crash. Reviewed-by: Thomas Hartmann
| * 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-305-8/+81
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Some 4.7.1 changes. Fix QScriptEngine::abortEvaluation. QAxBase::dynamicCall() returns invalid QVariant Fixes cursor shape when widget becomes native on X11. Update changes
| * | | | | Some 4.7.1 changes.Bjørn Erik Nilsen2010-09-301-0/+10
| | | | | |
| * | | | | Fix QScriptEngine::abortEvaluation.Jedrzej Nowacki2010-09-302-5/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch reduce time in which QScriptEngine would abort an script executing multiple long-running native functions. Task-number: QTBUG-9433 Reviewed-by: Olivier Goffart
| * | | | | QAxBase::dynamicCall() returns invalid QVariantPrasanth Ullattil2010-09-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting from 4.7.0, QVariant is recognized as a standard type by the meta type system. ActiveQt needs to consider this while converting COM VARIANT types to a QVariant. Task-number: QTBUG-13845 Reviewed-by: Volker Hilsheimer Reviewed-by: Olivier Goffart
| * | | | | Fixes cursor shape when widget becomes native on X11.Denis Dzyubenko2010-09-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a native window handle is created for a widget that has override cursor set, we should reset the cursor on the parent and set the cursor on the new window handle. Task-number: QTBUG-6185 Reviewed-by: Olivier Goffart
| * | | | | Update changesJens Bache-Wiig2010-09-301-0/+2
| | | | | |