summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-11-13223-21273/+36387
|\ | | | | | | into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-1343-2/+9975
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-13160-21216/+25695
| | |\ | | | | | | | | | | | | into kinetic-declarativeui
| | | * All items in list should have z: 1Martin Jones2009-11-131-1/+1
| | | |
| | | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-13143-21215/+21759
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Martin Jones2009-11-13143-21214/+21758
| | | | |\ | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | * | Compile.Martin Jones2009-11-131-1/+1
| | | | | |
| | | * | | Test package and view handling of unrequested items.Martin Jones2009-11-1316-0/+3935
| | | |/ /
| | * | | GridView visual testYann Bodson2009-11-1325-0/+6038
| | |/ /
| * | | docWarwick Allison2009-11-1310-36/+105
| | | |
| * | | typoWarwick Allison2009-11-131-1/+1
| | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-1366-97/+6959
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Export symbols for private QmlValueType, QmlValueTypeFactory classesKai Koehne2009-11-121-2/+2
| | | | | | | | | | | | Used in Bauhaus.
| | * Remote delegate loading tests.Alan Alpert2009-11-1210-2/+149
| | | | | | | | | | | | Not entirely finished, see QT-2498
| | * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-1238-61/+4742
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-12319-2924/+7591
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Another PathView visual testAlan Alpert2009-11-129-0/+2365
| | | | | | | | | | | | | | | | | | | | Altered pathItems count covers different code paths in much of pathview.
| | * | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-12290-2863/+5214
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Visual tests for positionersAlan Alpert2009-11-1212-17/+2033
| | | |/ / | | |/| | | | | | | | | | | | | | | | | dynamic.qml covers some of the more complex memory management issues, one of which is also fixed in this commit.
| * | | | Use local includes, not those in Qt. It matters when Declarative is a moduleWarwick Allison2009-11-132-1/+3
| | | | | | | | | | | | | | | | | | | | installed after Qt.
| * | | | Do not use "QtDeclarative/XXX" style includes in declarative module code,Warwick Allison2009-11-1296-145/+145
| | | | | | | | | | | | | | | | | | | | as it breaks reinstalling the module against existing Qt.
| * | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-1246-21068/+21610
| |\ \ \ \ | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| | * | | | Doc: fix typoVolker Hilsheimer2009-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-5167
| | * | | | Doc: Link to the public bug tracker.Volker Hilsheimer2009-11-112-11/+24
| | | | | |
| | * | | | Changes file updatedaavit2009-11-111-0/+2
| | | | | |
| | * | | | doc: Fixed some qdoc errors, numXxx() to xxxCount(), etc.Martin Smith2009-11-112-3/+10
| | | | | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Benjamin Poulain2009-11-1143-20848/+21472
| | |\ \ \ \
| | | * | | | Fixing warnings in QScopedPointer test caseJoão Abecasis2009-11-111-1/+2
| | | | | | |
| | | * | | | qdoc3: Allow the full signature for QML signals and methodsMartin Smith2009-11-114-25/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...in the \qmlmethod and \qmlsignal commands, and the corresponding "attached" ones. Previously, the type was not allowed, but it really should be there, which means the \qmlmethod and \qmlsignal commands should be updated throughout.
| | | * | | | qdoc3: Output the full signature for QML signals and methodsMartin Smith2009-11-112-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Method Documentation and Signal Documentation sections.
| | | * | | | qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-117-88/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note the Invalid Syntax errors for some uses of \qmlmethod and \qmlsignal. A syntactically correct signature is now required as the argument.
| | | * | | | Def files frozen for 4.6.0 RCShane Kearns2009-11-1120-361/+21660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
| | | * | | | Switch on DEF filesShane Kearns2009-11-111-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEF files containing the frozen DLL exports are in use for Symbian OS builds, except developer builds (configured with -developer-build) The reason for this exception is that developer builds export additional private interfaces to allow autotests to inject or monitor the internal data of a class. These autotest exports are not part of the API or the binary interface, so they are excluded from DEF files. Task-number: QTBUG-4436 Reviewed-by: Jason Barron
| | | * | | | Rewind def files to betaShane Kearns2009-11-1119-20979/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
| | | * | | | Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-116-9/+56
| | | |\ \ \ \
| | | | * | | | Pinchzoom example zooms more smoothDenis Dzyubenko2009-11-112-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remember the scale factor so it won't reset each time a new touch sequence starts. Reviewed-by: Bradley T. Hughes
| | | | * | | | Fixed opening files in the findfile example.Denis Dzyubenko2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDesktopServices::openUrl expects a proper url, not just a filename. Reviewed-by: Jedrzej Nowacki
| | | | * | | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1016-217/+805
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-104-59/+163
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-101-0/+33
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1054-265/+1161
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge remote branch 'origin/4.6' into 4.6-platformDenis Dzyubenko2009-11-09125-1381/+1758
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | Modified windowflags manualtestDenis Dzyubenko2009-11-092-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a few buttons to maximize a window from the code. Reviewed-by: trustme
| | | | * | | | | | | | | Add error handling for SetTimer() with the sentinel timer idBradley T. Hughes2009-11-091-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If SetTimer() fails when trying to delay sendPostedEvents(), emit a warning and try to continue. Reviewed-by: mauricek
| | | * | | | | | | | | | Merge commit 'origin/4.6' into 4.6-ceJoerg Bornemann2009-11-11280-2839/+5756
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | fix tst_qdatastream for Windows CEJoerg Bornemann2009-11-102-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SRCDIR is empty on Windows CE, so it doesn't make sense to prepend a slash. No other autotest does this. Also, we must deploy test2.svg. Reviewed-by: thartman
| | | * | | | | | | | | | | make qfunctions_wince.h C compatible againJoerg Bornemann2009-11-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mauricek
| | | * | | | | | | | | | | fix WebKit build on Windows CE 6Joerg Bornemann2009-11-096-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Again, we have fun with the C time functions on Windows CE. On Windows CE 5: the functions are declared but not defined. On Windows CE 6: the functions are neither declared nor defined. Reviewed-by: Simon Hausmann
| | | * | | | | | | | | | | tst_largefile.cpp Windows CE compile fixJoerg Bornemann2009-11-092-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: thartman
| | | * | | | | | | | | | | compile fix for tst_qfile on Windows CEJoerg Bornemann2009-11-092-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signature of QT_OPEN to be the same on all platforms. Reviewed-by: thartman