summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-0116-64/+531
|\ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: The declarative parser should only save comment text (and not /*,*/,//) Support for qsTrId and meta-data in comments for QML. Flickable ensure internal pressed state is cleared when mouse is released. Fix examples autotest Support JS "in" operator on QML objects Only emit change signal when variant properties actually change Use QApplication in QDeclarativeEngine example.
| * The declarative parser should only save comment text (and not /*,*/,//)Michael Brasser2010-09-012-7/+5
| | | | | | | | Reviewed-by: Roberto Raggi
| * Support for qsTrId and meta-data in comments for QML.Michael Brasser2010-09-015-2/+456
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-0111-59/+74
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Flickable ensure internal pressed state is cleared when mouse is released. Fix examples autotest Support JS "in" operator on QML objects Only emit change signal when variant properties actually change Use QApplication in QDeclarativeEngine example.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-019-54/+66
| | |\
| | | * Fix examples autotestJoona Petrell2010-09-013-49/+8
| | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Bea Lam
| | | * Support JS "in" operator on QML objectsAaron Kennedy2010-09-013-1/+19
| | | | | | | | | | | | | | | | QTBUG-12837
| | | * Only emit change signal when variant properties actually changeAaron Kennedy2010-09-013-4/+39
| | | | | | | | | | | | | | | | QTBUG-12601
| | * | Flickable ensure internal pressed state is cleared when mouse is released.Martin Jones2010-09-011-0/+1
| | |/ | | | | | | | | | | | | | | | | | | We did this when handling the mouse events ourselves, but if e.g. a mousearea stole the mouse, we didn't reset the pressed flag. Task-number: QTBUG-12343
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-3195-1928/+7936
| | |\
| | * | Use QApplication in QDeclarativeEngine example.Martin Jones2010-08-311-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Using QCoreApplication causes a crash if you tried to load graphical components. Task-number: QTBUG-13319
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-016-73/+156
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix some missing proxy calles for CleanLooks Destroy QNetworkConfigurationManager global static from qApp dtor. Fix EasyWLAN handling.
| * | | Fix some missing proxy calles for CleanLooksJens Bache-Wiig2010-09-011-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | These were simply left out as an oversight. Task-number: QTBUG-13318
| * | | Destroy QNetworkConfigurationManager global static from qApp dtor.Aaron McCarthy2010-09-011-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The order of global static destruction is not well defined. Ensure that the QNetworkConfigurationManager global static is destroyed from the QCoreApplication destructor before its dependencies are destroyed with the rest of the global statics. Task-number: QTBUG-13304
| * | | Fix EasyWLAN handling.Aaron McCarthy2010-09-014-67/+129
|/ / / | | | | | | | | | | | | | | | | | | RCmManager is not sharable between threads, use a function local instance instead. Task-number: QTBUG-13064
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-0168-1518/+824
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove unused source files in designer make various POST_LINK steps nicer fix qt_webkit_version.pri install for in-Qt builds fix windows build with -prefix Update to the NTLM code. QTextEngine::LayoutData::reallocate musn't corrupt memory Updated Twitter demo in response to the new Twitter oauth requirement doc: Remove \internal tag from QScriptProgram Doc: Reviewed updates to the model/view tutorial. QNetworkAccessManager doc: add since tag for added enum fixed compilation problem added missing files added missing files problem: 2 images that were in raw html tables appeared smaller in konqueror for some reason - solution: fixed width for right columns in 2 raw html tables moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8
| * | Remove unused source files in designerVictor Ostashevsky2010-08-313-170/+1
| | | | | | | | | | | | | | | Merge-request: 2463 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | make various POST_LINK steps nicerOswald Buddenhagen2010-08-315-23/+14
| | | | | | | | | | | | | | | | | | | | | put each step into a separate make command. that makes for cleaner output and less troubles with command separators. Reviewed-by: mariusSO
| * | fix qt_webkit_version.pri install for in-Qt buildsOswald Buddenhagen2010-08-311-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | always add the target, even if building inside Qt - as opposed to the headers and libraries, there are no rules for that coming from qbase.pri. Task-number: QTBUG-13306
| * | fix windows build with -prefixOswald Buddenhagen2010-08-311-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | passing just a spec name to qmake is bogus, as it will try to find it in the install dir, which of course won't work before it is installed. so either pass nothing at all (when preparing the libraries, as .qmake.cache already contains the right path), or explicitly pass a full path (when building the host tools, as we have to override the spec here). Reviewed-by: mariusSO
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-3159-1350/+824
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update to the NTLM code. QTextEngine::LayoutData::reallocate musn't corrupt memory Updated Twitter demo in response to the new Twitter oauth requirement doc: Remove \internal tag from QScriptProgram Doc: Reviewed updates to the model/view tutorial. QNetworkAccessManager doc: add since tag for added enum fixed compilation problem added missing files added missing files problem: 2 images that were in raw html tables appeared smaller in konqueror for some reason - solution: fixed width for right columns in 2 raw html tables moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8
| * | Update to the NTLM code.Thiago Macieira2010-08-311-19/+37
| | | | | | | | | | | | | | | | | | | | | | | | Fixes extraction of time from the server, and saves the domain information properly. Patch by subcontractor Reviewed-by: Thiago Macieira
| * | QTextEngine::LayoutData::reallocate musn't corrupt memoryJoão Abecasis2010-08-311-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | ... on re-allocation failure. So, let's actually check the returned pointer and fail, instead of using Q_CHECK_PTR. Task-number: QT-3785 Reviewed-by: Peter Hartmann Reviewed-by: Samuel Rødal
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-3157-1329/+782
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated Twitter demo in response to the new Twitter oauth requirement doc: Remove \internal tag from QScriptProgram Doc: Reviewed updates to the model/view tutorial. QNetworkAccessManager doc: add since tag for added enum fixed compilation problem added missing files added missing files problem: 2 images that were in raw html tables appeared smaller in konqueror for some reason - solution: fixed width for right columns in 2 raw html tables moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8
| | * | Updated Twitter demo in response to the new Twitter oauth requirementJens Bache-Wiig2010-08-3114-461/+332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Twitter is blocking access to the old authentification method that our demo was using. This breaks the demo completely. To fix this, I changed the demo into only make use of the public search API. You can no longer tweet but you can search for different tweets. At the moment making an oauth capable demo is not desirable due to the problems with handling a secret app token among other issues. Task-number: QTBUG-13181 Reviewed-by: Alan Alpert
| | * | doc: Remove \internal tag from QScriptProgramKent Hansen2010-08-312-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class has been there since 4.6 (http://labs.trolltech.com/blogs/2009/11/23/qtscript-in-46/), but we don't see a reason to hide it any longer. Task-number: QTBUG-13229 Reviewed-by: Olivier Goffart
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-31107-1721/+7042
| | |\ \
| | | * | QNetworkAccessManager doc: add since tag for added enumPeter Hartmann2010-08-311-1/+1
| | | | |
| | * | | Doc: Reviewed updates to the model/view tutorial.David Boddie2010-08-311-454/+356
| | | | |
| | * | | Merge branch '4.7' of ../msculls-modelview-qdoc-enhancement into 4.7David Boddie2010-08-3040-858/+541
| | |\ \ \
| | | * | | fixed compilation problemRoland Wolf2010-07-302-7/+13
| | | | | |
| | | * | | Merge branch 'modelviewdoc' of ↵Roland Wolf2010-07-301-3/+3
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/msculls-modelview-qdoc-enhancement into modelviewdoc
| | | | * | | problem: 2 images that were in raw html tables appeared smaller in konqueror ↵Michael D Scull2010-07-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | for some reason - solution: fixed width for right columns in 2 raw html tables
| | | * | | | added missing filesRoland Wolf2010-07-304-0/+318
| | | | | | |
| | | * | | | added missing filesRoland Wolf2010-07-302-0/+119
| | | |/ / /
| | | * | | moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8Roland Wolf2010-07-2940-1245/+485
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-315-12/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Undefined SSE symbols when crosscompiling Qt on PPC.
| * | | | | Undefined SSE symbols when crosscompiling Qt on PPC.Benjamin Poulain2010-08-315-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt does not build on PowerPC when compiling for both x86 and PPC on Mac. The compiler is invoked only once for both architecture so the defines are there in order to get the optimized path for x86. Those defines needs to be removed from the compilation environment when the target is set to PPC by GCC. Reviewed-by: Kent Hansen
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-317-13/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix gcce building of apps using static libraries in symbian-sbsv2
| * | | | | | Fix gcce building of apps using static libraries in symbian-sbsv2Miikka Heikkinen2010-08-317-13/+50
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed usage of buggy .release_gcce target from symbian-sbsv2 generated makefiles. Now gcce builds like armv5 as it is supposed to when using Raptor. Task-number: QTBUG-13307 Reviewed-by: axis
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-3115-62/+177
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Center and clip QML startup animation so it looks correct in fullscreen Prevent calling deleteLater() from QML Ignore non-scriptable properties in QML
| * | | | | Center and clip QML startup animation so it looks correct in fullscreenAaron Kennedy2010-08-311-41/+47
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-12831
| * | | | | Prevent calling deleteLater() from QMLAaron Kennedy2010-08-313-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-13045
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-3142-497/+5680
| |\ \ \ \ \ | | |/ / / /
| * | | | | Ignore non-scriptable properties in QMLAaron Kennedy2010-08-3113-19/+104
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-13043
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-315-152/+283
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make tst_image a little bit more tollerent to rounding errors Clear the QGLWindowSurface in ::beginPaint when needed. Made QT_GL_SWAPBUFFER_PRESERVE=1 with the GL graphics system work. Fix QStaticText with OpenGL1 engine tst_qimage: backport fix of commit 0d7e683 into 4.7 qdrawhelper: backport the optimisations in fetchTransformBilinear from master to 4.7
| * | | | | Make tst_image a little bit more tollerent to rounding errorsOlivier Goffart2010-08-311-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 23306a399c0703eea7420231903c850566bfe2f0)
| * | | | | Clear the QGLWindowSurface in ::beginPaint when needed.Michael Dominic K2010-08-311-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2462 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | | Made QT_GL_SWAPBUFFER_PRESERVE=1 with the GL graphics system work.Samuel Rødal2010-08-311-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On desktop, we should just do swapBuffers() in swapRegion(). Reviewed-by: Trond
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-313-142/+262
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix QStaticText with OpenGL1 engine tst_qimage: backport fix of commit 0d7e683 into 4.7 qdrawhelper: backport the optimisations in fetchTransformBilinear from master to 4.7
generated by cgit v0.12 at 2025-08-25 13:26:10 (GMT)