summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Exposing some Validators requires Qt >= 4.7.0Alan Alpert2010-02-152-2/+6
| | | | This commit should make declarative compile against 4.6.2 again.
* Stabilize positioner testsAlan Alpert2010-02-151-62/+55
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-15490-7697/+4663
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-1518-17/+45
| |\
| | * Make tst_xmlhttprequest more reliableAaron Kennedy2010-02-1510-5/+15
| | |
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-154-10/+15
| | |\
| | | * Make tst_qmlecmascript::dynamicDestruction stableAaron Kennedy2010-02-151-5/+4
| | | |
| | | * Make tst_qmlmetatype stableAaron Kennedy2010-02-151-3/+6
| | | |
| | | * Make tests compile without webkitAaron Kennedy2010-02-152-2/+5
| | | |
| | * | Update as test running qmakery changes.Warwick Allison2010-02-151-1/+7
| | |/
| | * Fix compile with -no-webkitWarwick Allison2010-02-153-1/+8
| | |
| * | For qmldebug* tests, make sure engine is running before the test threadBea Lam2010-02-156-36/+88
| |/ | | | | | | is started. Also fix some memory leaks.
| * Fix buildWarwick Allison2010-02-153-6/+0
| | | | | | | | Remove unneeded .moc imports resulting from moved classes.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-15425-7030/+3720
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-1541-522/+719
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Remove noop code Move type initialization from global static initializers to QmlEngine construction.
| | * \ Merge branch 'qt-master-from-4.6' of ↵Qt Continuous Integration System2010-02-13383-4201/+2598
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (85 commits) Add make stub_sis target, and add webkit stub to qt.iby Fix to S60 softkeys when no active Qt window or native widget is shown. doc: Fixed several typos. Doc: remove \preliminary tag from public multimedia classes Fixed the perl download link and description in docs Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build QtWebKit with THUMB again QNAM HTTP: Optimize detectPipeliningSupport() QNAM HTTP: Set channel to IdleState at better place QXmlSchema: fix crash in schema parser We need to export qBadAlloc() on all platforms now really fix the message editor for dark backgrounds Revert "(ODBC) Use wchar_t instead of assuming 2 bytes." Update Symbian DEF files Export a function to get dfb-surface from a pixmap Fix the WebKit build Blinking cursors are 2 pixels wide on Mac OS X/Cocoa. Fixed compilation with QT_NO_WHEELEVENT Fixed usage of QGLPixelBuffer with share widgets on other X11 screens. Fixed drawing QPixmaps on QGLWidgets on different X11 screens. Take into account the solaris-cc-64-stlport mkspec ...
| | | * \ Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-132676-3479/+321418
| | | |\ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1342-2829/+1122
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Refactor font and zoom handling, reduces clutter in central widget. Some more refactoring. Move the QWebView based help viewer into it's own source files. add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefs use variables from the spec instead of hard-coding platform ifdefs move $(DEL_FILE) 2> NUL redirection into .conf file fix host platform conditional purge msvc.net and msvc2002 makespecs. unsupported for a while now. purge msvc6 suppport from qmake. qt doesn't support it for quite a while now. remove weird -tp ce matching line nobody can say anything about remove remainder of mac9 mode remove the most blatant tmake compat paths simplify add qt5 todo
| | | * | | Refactor font and zoom handling, reduces clutter in central widget.kh12010-02-1210-167/+212
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ck
| | | * | | Some more refactoring.kh12010-02-1212-358/+462
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the QTextBrowser based help viewer into it's own source files and introduce a common base clase that currently only contains the statics, but more to come for common stuff. Review: ck
| | | * | | Move the QWebView based help viewer into it's own source files.kh12010-02-129-434/+560
| | | | | |
| | | * | | add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefsOswald Buddenhagen2010-02-122-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| | | * | | use variables from the spec instead of hard-coding platform ifdefsOswald Buddenhagen2010-02-121-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| | | * | | move $(DEL_FILE) 2> NUL redirection into .conf fileOswald Buddenhagen2010-02-122-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | littering generic makefile generator code with it is both plain ugly and unnecessary. Reviewed-by: mariusSO
| | | * | | fix host platform conditionalOswald Buddenhagen2010-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| | | * | | purge msvc.net and msvc2002 makespecs. unsupported for a while now.Oswald Buddenhagen2010-02-124-359/+0
| | | | | | | | | | | | | | | | | | | | | | | | Suggested-by: mariusSO
| | | * | | purge msvc6 suppport from qmake. qt doesn't support it for quite a while now.Oswald Buddenhagen2010-02-1213-1585/+7
| | | | | | | | | | | | | | | | | | | | | | | | Acked-by: mariusSO
| | | * | | remove weird -tp ce matching line nobody can say anything aboutOswald Buddenhagen2010-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| | | * | | remove remainder of mac9 modeOswald Buddenhagen2010-02-125-24/+6
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| | | * | | remove the most blatant tmake compat pathsOswald Buddenhagen2010-02-123-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: mariusSO
| | | * | | simplifyOswald Buddenhagen2010-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no need to recalculate a value which we have an own variable for Reviewed-By: mariusSO
| | | * | | add qt5 todoOswald Buddenhagen2010-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| | | | * | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-1323-78/+114
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp
| | | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-127-54/+94
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add make stub_sis target, and add webkit stub to qt.iby Fix to S60 softkeys when no active Qt window or native widget is shown.
| | | | | | * | Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-124-43/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake - add targets to wrapper make file make stub_sis createpackage - use -s or --stub to run makesis with the -s argument also copies the file to the right place in epoc32\data\system\installs qt.iby - add qt_stub.sis and qt_webkit_stub.sis Task-number: QTBUG-6570 Reviewed-by: Miikka Heikkinen
| | | | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-123-11/+8
| | | | | | |\ \ | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix to S60 softkeys when no active Qt window or native widget is shown.
| | | | | | * | Fix to S60 softkeys when no active Qt window or native widget is shown.Janne Anttila2010-02-123-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Softkeys need to be updated also when Qt activewindow is set to NULL, this is needed that usecase where last Qt widget is closed works correctly. I.e. closed widget softkeys has to be removed, and replaced by default "Exit" softkey. Earlier only window activation or widget focusIn event caused softkey update. In addition IsDisplayingMenuOrDialog does not work correctly under all circumstances. Sometimes when menu is being launched the Qt gets focusChanged event before the menu is actually shown, but menu CBA is already created. This is fixed by checking that we update CBA only when AppUi CB is the current one. This assumption works as long as Qt uses only the CBA created by S60 application framwork and does not create other CEikButtonGroupContainer instances. Task-number: QTBUG-6115 Reviewed-by: Sami Merila
| | | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1216-24/+20
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Fixed several typos. Doc: remove \preliminary tag from public multimedia classes
| | | | | | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-02-124-4/+0
| | | | | | |\ \ \
| | | | | | | * | | Doc: remove \preliminary tag from public multimedia classesVolker Hilsheimer2010-02-124-4/+0
| | | | | | |/ / / | | | | | |/| | |
| | | | | | * | | doc: Fixed several typos.Martin Smith2010-02-1212-20/+20
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-7997
| | | | * | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-12365-4133/+2491
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-112-13/+11
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build QtWebKit with THUMB again QNAM HTTP: Optimize detectPipeliningSupport() QNAM HTTP: Set channel to IdleState at better place
| | | | | | * | | Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build ↵Simon Hausmann2010-02-111-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit with THUMB again This restores the library size and memory consumption. Reviewed-by: Janne Koskinen Reviewed-by: Iain
| | | | | | * | | QNAM HTTP: Optimize detectPipeliningSupport()Markus Goetz2010-02-111-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do cheap checks first. Reviewed-by: TrustMe
| | | | | | * | | QNAM HTTP: Set channel to IdleState at better placeMarkus Goetz2010-02-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The readyRead() from the expand() function called from allDone() had a new request triggered for that channel even if it is not really finished yet. Move the assignment to IdleState inside allDone to avoid this error. Reviewed-by: Andreas Kling Reviewed-by: Peter Hartmann
| | | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-112-5/+0
| | | | | |\ \ \ \ | | | | | | |_|/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: We need to export qBadAlloc() on all platforms
| | | | | | * | | We need to export qBadAlloc() on all platformsHarald Fernengel2010-02-112-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This supports the (documented) case when mixing Qt built without exception support with code that was built against Qt with exception support. Reviewed-by: Robert Griebl
| | | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-111-2/+4
| | | | | |\ \ \ \ | | | | | | |_|/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed the perl download link and description in docs
| | | | | | * | | Fixed the perl download link and description in docsMiikka Heikkinen2010-02-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old link was defunct as the version it pointed is no longer available. Task-number: QTBUG-8134 Reviewed-by: TrustMe
generated by cgit v0.12 at 2025-08-25 18:40:29 (GMT)