summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH)Oswald Buddenhagen2010-04-301-8/+7
| | | | | | | this is what prevented using QMAKE_LFLAGS_RPATH instead of the obsolete QMAKE_RPATH in our own qmake.conf files. Reviewed-by: Tobias Hunger
* warn about usage of deprecated variablesOswald Buddenhagen2010-04-301-0/+5
| | | | Reviewed-by: joerg
* warn about using non-lowercased replace $$function()sOswald Buddenhagen2010-04-301-1/+5
| | | | | | planning to kill off that (mis-)feature at some point. Reviewed-by: joerg
* add -Wdeprecated option (on by default)Oswald Buddenhagen2010-04-302-3/+8
| | | | Reviewed-by: joerg
* make QMakeProject::isEmpty() consider legacy mappingsOswald Buddenhagen2010-04-302-3/+6
| | | | Reviewed-by: joerg
* document some functions' scopeOswald Buddenhagen2010-04-301-5/+5
| | | | Reviewed-by: joerg
* fix $$size() not using function-scoped variablesOswald Buddenhagen2010-04-301-2/+1
| | | | | Reviewed-by: Janne Anttila Reviewed-by: joerg
* doc: Fixed some qdoc errors.Martin Smith2010-04-303-14/+2
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-304-122/+220
|\
| * Autotest: check that we receive key events on toplevel widgetsRichard Moe Gustavsen2010-04-302-8/+58
| | | | | | | | | | | | Autotest add to test db322e8aec1cae Reviewed-by: denis
| * Cocoa: key events stopped workingRichard Moe Gustavsen2010-04-301-0/+6
| | | | | | | | | | | | | | | | If you have an empty toplevel widget, that widget will not receive key events anymore. Seems that we need to revert some parts of 90dfb5e5d8fc8cb841b0762cd88aa4b996c38312 Rev-By: denis
| * Update Polish translationsJarek Kobus2010-04-301-114/+156
| |
* | qdoc: Added breadcrumbs for namespaces.Martin Smith2010-04-302-3/+7
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-3011-1692/+3062
|\
| * French translation strings, originally made by external translators.Pierre Rossi2010-04-291-1674/+2976
| | | | | | | | | | | | | | | | Plus some fixes and additional translations. Reviewed-by: TrustMe Reviewed-by: Benjamin Poulain Reviewed-by: Gabriel
| * Set the enabled state on the page when changing the QTabWidgetKevin Ottens2010-04-292-3/+8
| | | | | | | | | | | | | | | | | | Enabling/disabling a tab of QTabWidget should also change the state of the widget. Otherwhise it is possible to have a page enabled for a disabled widget. Merge-request: 2354 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * add QString::setRawData() and revive QByteArray::setRawData()Oswald Buddenhagen2010-04-294-10/+73
| | | | | | | | | | this is solely for optimization purposes - saves a free()/malloc() pair each time an existing object is re-used.
| * Backport a fix to Designer filterwidgetJens Bache-Wiig2010-04-292-3/+3
| | | | | | | | | | | | | | Using static here is obviously incorrect as the animations are done per widget. Reviewed-by: danimo
| * Added wildcards to allow custom mkspecs namesConstantin Makshin2010-04-292-2/+2
| | | | | | | | | | Merge-request: 2374 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | qdoc: Added "All namespaces" to the API Lookup box.Martin Smith2010-04-301-0/+1
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-292-0/+18
|\
| * add some QNetworkCookieJar testsPeter Hartmann2010-04-281-0/+3
| | | | | | | | ... regarding the previous merge request.
| * Secure Cookies should only be sent over secure connections.Robert Hogan2010-04-282-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://bugreports.qt.nokia.com/browse/QTBUG-9618 QtWebKit currently fails the following test: LayoutTests/http/tests/xmlhttprequest/cookies.html This is because QNetworkCookieJar::cookiesForUrl returns secure cookies even when the connection is not secure. A 'secure' cookie is set by response headers from a http server as follows: 'Set-Cookie: cookie-name=value; secure' Correct QNetworkCookieJar::cookiesForUrl to ignore secure cookies when the url in the request is not 'https:'. Task-number: QTBUG-9618 Merge-request: 2372 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* | qdoc: Added breadcrumbs to examples. Coolio.Martin Smith2010-04-293-0/+37
|/ | | | Doesn't work in a few cases because of non-standard naming of things.
* qdoc: Sprinkled more breadcrumbs.Martin Smith2010-04-282-9/+20
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-28127-577/+3773
|\
| * Update Polish translationsJarek Kobus2010-04-281-160/+160
| |
| * Fix compatibility with Qt Mobility.Aaron McCarthy2010-04-281-4/+8
| | | | | | | | | | | | Applications which are built against Qt 4.7 but choose to use the bearer management module from Qt Mobility do not get to set/get the network configuration used by QNAM.
| * Fix compile.Aaron McCarthy2010-04-281-1/+1
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-2718-43/+798
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compilation with QT_NO_TEXTSTREAM Fix the compilation with QT_NO_TOOLTIP Add unit tests for a number of QList methods. Crash while dragging on Mac OS X (Cocoa) Doc & menubar hidden for QtDemo after switching back from fullscreen qdoc: Added breadcrumbs for class pages. QTabWidget documentMode not working correctly on Mac qdoc: Removed MacRefs for Xcode documentation stuff. Slight QList documentation fix.
| | * Fix compilation with QT_NO_TEXTSTREAMTasuku Suzuki2010-04-271-1/+1
| | | | | | | | | | | | | | | Merge-request: 582 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | * Fix the compilation with QT_NO_TOOLTIPTasuku Suzuki2010-04-272-0/+6
| | | | | | | | | | | | | | | Merge-request: 579 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-2759-482/+3080
| | |\
| | | * Add unit tests for a number of QList methods.Robin Burchell2010-04-271-0/+489
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Granted, if this breaks, it will be noticed quickly - but it is desirable to catch such problems at test time rather than in production. Merge-request: 575 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * Crash while dragging on Mac OS X (Cocoa)Prasanth Ullattil2010-04-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens only if a new drag is started while a drag operation is going on. It seems to be an unsupported operation on Mac. Reviewed-by: Fabien Freling
| | | * Doc & menubar hidden for QtDemo after switching back from fullscreenCarlos Manuel Duclos Vergara2010-04-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here was fix for bug QTBUG-8933. In order to fix that bug we added a new call to the SetSystemUIMode(...) system call, but I forgot to update the status inside Qt, so the system didn't know it was in full screen mode. Task-number: QTBUG-9883 Reviewed-by: Prasanth
| | * | Merge commit 'refs/merge-requests/577' of git://gitorious.org/qt/qt into ↵David Boddie2010-04-271-6/+2
| | |\ \ | | | | | | | | | | | | | | | integration
| | | * | Slight QList documentation fix.Robin Burchell2010-04-261-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mentioning that the operation is constant time is fine, however, saying that it is fast because it preallocates 'to allow fast growth' seems a little bit confusing given these methods are related to item removal.
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-27107-379/+2939
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (30 commits) Ensure text document is created before we access it. Plugins documentation. Fix update issue when an item has an effect and child. Fix QDeclarativeTextInput and QGraphicsView in regards of input methods hints. Disallow "Qt" as namespace import Don't "adjust" the z value of a delegate that has been cached. Correctly inherit extension properties Autotests More QDeclarativeNetworkAccessManagerFactory doc clarification. Fix QDeclarativeNetworkAccessManagerFactory docs. Don't crash on invalid model remove signal. Ensure scheduled layout can occur before testing. Fix remaining 4.6 type registrations (to 4.7). doc anchor margins vs. anchor (line) state/animation. These examples should not be included in this test Unify naming of settings / UI to be "Qt Qml Runtime" Improved error messages for type resolving, new debug option Link to example files from tutorial pages Add tutorial for writing QML extensions no export in plugin ...
| | * | | | Ensure text document is created before we access it.Martin Jones2010-04-271-0/+1
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-27106-379/+2938
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits) Plugins documentation. Fix update issue when an item has an effect and child. Fix QDeclarativeTextInput and QGraphicsView in regards of input methods hints. Disallow "Qt" as namespace import Don't "adjust" the z value of a delegate that has been cached. Correctly inherit extension properties Autotests More QDeclarativeNetworkAccessManagerFactory doc clarification. Fix QDeclarativeNetworkAccessManagerFactory docs. Don't crash on invalid model remove signal. Ensure scheduled layout can occur before testing. Fix remaining 4.6 type registrations (to 4.7). doc anchor margins vs. anchor (line) state/animation. These examples should not be included in this test Unify naming of settings / UI to be "Qt Qml Runtime" Improved error messages for type resolving, new debug option Link to example files from tutorial pages Add tutorial for writing QML extensions no export in plugin Add doc pages for qml examples. ...
| | | * | | | Plugins documentation.Bea Lam2010-04-272-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10129
| | | * | | | Fix update issue when an item has an effect and child.Alexis Menard2010-04-272-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a child marks its parent as dirty (and the parent has an effect) and they are not in a scene, they must not set fullUpdatePending to 1 because if the scene is in fullUpdate (not yet painted) then the item will not be processed by processDirtyItemRecursive so the fullUpdatePending flag will never be reset by resetDirtyItem. Any calls to update() will be then discarded because it will think that a full update is pending for the item. A full update will be done anyway by the scene and if not then markDirty will do its job when the parent will be added to the scene. Task-number:QTBUG-10037 Reviewed-by:bnilsen
| | | * | | | Fix QDeclarativeTextInput and QGraphicsView in regards of input methods hints.Alexis Menard2010-04-275-12/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the echoMode changes for QDeclarativeTextInput we need to update the inputmethod hints. Also in QGraphicsView we need to update the input context installed on the view to make the former is aware of the change. For the input context framework the only way to deal with the current widget is focusWidget(). Unfortunately the widget that has the focus is the QGraphicsView so the input context don't know the real object QGraphicsView is actually focusing. We must keep in sync the inputMethodHints of QGV with the object QGraphicsView is focusing so the input context just called focusWidget()->inputMethodhints() to update itself. Task-number:QTBUG-9922 Reviewed-by:janarve Reviewed-by:bnilsen Reviewed-by:Michael Brasser
| | | * | | | Disallow "Qt" as namespace importAaron Kennedy2010-04-274-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This conflicts with the global object's "Qt" property. QTBUG-10143
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-274-12/+37
| | | |\ \ \ \
| | | | * | | | Don't "adjust" the z value of a delegate that has been cached.Martin Jones2010-04-274-12/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10131
| | | * | | | | Correctly inherit extension propertiesAaron Kennedy2010-04-274-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct a typo that breaks extension properties in some cases.
| | | * | | | | AutotestsAaron Kennedy2010-04-276-9/+65
| | | |/ / / /
| | | * | | | More QDeclarativeNetworkAccessManagerFactory doc clarification.Martin Jones2010-04-271-1/+3
| | | | | | |