summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QMetaType: Now we can register typedefs.Olivier Goffart2010-03-026-6/+146
| | | | | | | Task-number: QTBUG-6833 Task-number: QTBUG-937 Reviewed-by: Brad Reviewed-by: Kent Hansen
* Fix & move QEgl::native* to platform-specific filesTom Cooksey2010-03-025-20/+49
| | | | | | This should fix build on Symbian & WinCE Reviewed-By: TrustMe
* Updates to changes fileaavit2010-03-021-0/+6
| | | | Reviewed-by: trustme
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0225-656/+950
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make bindTextureFromNativePixmap use new QEgl APIs Move QGLWidget::setContext logic into QEgl & QGLContext Move EGL surface type setting to new QEglProperties::setDeviceType Replace qt_egl_add_platform_config with existing QEglProperties API Use QEgl::display in QGLTemporaryContext so EGL is init'd only once Remove qt_egl_setup_x11_visual Make QGLWidget use new QEgl::getCompatibleVisualId API Add QEglContext::configAttrib(int name) helper Add getCompatibleVisualId to QEgl on X11 Add QEgl::defaultConfig method to select configs suitable for Qt Make QEgl::createSurface cross-platform and add native getters Move chooseConfig and createSurface logic to QEgl functions Move static methods from QEglContext to QEgl namespace Move qegl_p.h -> qeglcontext_p.h and add a new qegl_p.h
| * Make bindTextureFromNativePixmap use new QEgl APIsTom Cooksey2010-03-026-20/+39
| | | | | | | | | | | | | | The old qt_chooseEGLConfigForPixmap & qt_createEGLSurfaceForPixmap code will remain until QX11GLPixmapData can be re-written properly. Reviewed-By: TrustMe
| * Move QGLWidget::setContext logic into QEgl & QGLContextTom Cooksey2010-03-026-131/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QEgl::createSurface() on X11 will now check to see if the device's X11 Visual is compatible with the EGLConfig passed in. If it is not compatible, the function will re-create the QPaintDevice's native drawable with a different Visual (one which is compatable with the EGLConfig). This represented the bulk of the QGLWidget::setContext method which is now much simpler. As a consequense of this change, QWidgets with graphicssystem opengl will behave much more like QGLWidget as most of the code is re-used. So things like WA_TranslucentBackground should now work with opengl graphicssystem too. Reviewed-By: TrustMe
| * Move EGL surface type setting to new QEglProperties::setDeviceTypeTom Cooksey2010-03-028-41/+53
| | | | | | | | | | | | Also renamed qt_egl_set_format->qt_eglproperties_set_glformat Reviewed-By: TrustMe
| * Replace qt_egl_add_platform_config with existing QEglProperties APITom Cooksey2010-03-024-35/+3
| | | | | | | | | | | | | | QEglProperties::setPaintDeviceFormat() seems to be a copy & paste of qt_egl_add_platform_config for every platform anyway. Reviewed-By: TrustMe
| * Use QEgl::display in QGLTemporaryContext so EGL is init'd only onceTom Cooksey2010-03-021-6/+1
| | | | | | | | Reviewed-By: Trond Kjernåsen
| * Remove qt_egl_setup_x11_visualTom Cooksey2010-03-021-149/+1
| | | | | | | | | | | | | | This method has been re-written as QEgl::getCompatibleVisualId() which is much cleaner code. Reviewed-By: TrustMe
| * Make QGLWidget use new QEgl::getCompatibleVisualId APITom Cooksey2010-03-022-5/+18
| | | | | | | | Reviewed-By: TrustMe
| * Add QEglContext::configAttrib(int name) helperTom Cooksey2010-03-022-0/+11
| | | | | | | | Reviewed-By: TrustMe
| * Add getCompatibleVisualId to QEgl on X11Tom Cooksey2010-03-022-0/+149
| | | | | | | | | | | | | | | | This method takes an EGLConfig and hands back an X11 VisualID which can be used to create native windows/pixmaps which will have an EGL surface created for them using the given EGL config. Reviewed-By: TrustMe
| * Add QEgl::defaultConfig method to select configs suitable for QtTom Cooksey2010-03-023-0/+188
| | | | | | | | Reviewed-By: TrustMe
| * Make QEgl::createSurface cross-platform and add native gettersTom Cooksey2010-03-026-123/+57
| | | | | | | | | | | | | | | | | | | | QEgl::createSurface was virtually identical for every platform apart from the line which returned the native window type. This patch just adds QEgl::nativePixmap and QEgl::nativeWindow which are platform specific (though the default widget->winId() works for everything apart from symbian). Reviewed-By: Aleksandar Sasha Babic
| * Move chooseConfig and createSurface logic to QEgl functionsTom Cooksey2010-03-026-12/+28
| | | | | | | | | | | | | | | | We keep the methods in QEglContext, but these are useful helpers which wrap the QEgl version of the functions, which is where the bulk of the logic is (for these functions anyway). Reviewed-By: Aleksandar Sasha Babic
| * Move static methods from QEglContext to QEgl namespaceTom Cooksey2010-03-0210-88/+97
| | | | | | | | Reviewed-By: Aleksandar Sasha Babic
| * Move qegl_p.h -> qeglcontext_p.h and add a new qegl_p.hTom Cooksey2010-03-0218-117/+196
| | | | | | | | | | | | | | | | This puts the QEgl namespace in a single file which can be used by both qeglcontext and qeglproperties. Files which need QEglContext should now include qeglcontext_p.h. Reviewed-By: Aleksandar Sasha Babic
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-029-38/+81
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Fixed some qdoc errors. qdoc: Second attempt, QML doc stuff.
| * | doc: Fixed some qdoc errors.Martin Smith2010-03-022-2/+2
| | |
| * | qdoc: Second attempt, QML doc stuff.Martin Smith2010-03-027-36/+79
|/ / | | | | | | | | | | | | | | | | | | | | | | | | This change caused a crash on several platforms before, but not on mine, of course. It outputs a list of new QML elements on the What's New in 4.7 page, and it outputs the "Inherited by" list on each QML elemnent page for elements that are inherited by other elements. I can't see why it should crash anything, but I have included some debug output. I think the crash might have something to do with QList<T>, which qdoc3 uses heavily. If it crashes for you, please get a stack trace and the debug output.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0222-302/+730
|\ \ | |/ |/| | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Bearer management changes from Qt Mobility (fca9891).
| * Merge remote branch 'staging/4.7' into HEADAaron McCarthy2010-03-022627-143654/+170820
| |\ | | | | | | | | | | | | Conflicts: src/plugins/bearer/corewlan/qcorewlanengine.mm
| * | Bearer management changes from Qt Mobility (fca9891).Aaron McCarthy2010-03-0223-369/+794
| | | | | | | | | | | | fca98911b75ce12e70d93cfc2932a9759758a605
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-015-32/+60
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: removed dead code QMetaObject::invokeMethod: print a warning if the method is not found. Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-015-32/+60
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: removed dead code QMetaObject::invokeMethod: print a warning if the method is not found. Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.
| | * | removed dead codeThierry Bastian2010-03-011-21/+12
| | | | | | | | | | | | | | | | Reviewed-by: denis
| | * | QMetaObject::invokeMethod: print a warning if the method is not found.Olivier Goffart2010-03-013-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adapt QTestLib not to call invokeMethod on unexisting method to avoid warnings Task-number: QTBUG-7331 Reviewed-by: Brad
| | * | Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.Trond Kjernåsen2010-03-011-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the 4.7 port of d04f5336f769d9e5d2f9105e1da4a7d23ea91795. Task-number: related to QTBUG-8455 Reviewed-by: Kim
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0121-61/+152
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: typo for windows ce exclusion rule Updated .gitignore with the new name of the qmlviewer Fixed the close button of the find widget in Assistant Doc: brief Qt Quick introduction on "What's New" page. Interview Demo: Fix warning about pixmap leak on X11. Perform latin1 conversion directly on JSC::UString Avoid conversion between JavaScriptCore String type and QString Doc: Rephrase documentation for QColor::isValidColor and add \since 4.7. Use QList::reserve() in QDataStream>>QList Added static method isValidColor to QColor. compile fix with namespaces build fix for WinCE qDetectCPUFeatures: compile fix with namespaces compile fix for WinCE Mac: using Qt to write plugins disables quit for 3rd party application doc: Fixed building documentation Updated syncqt to use relative include paths on cygwin as well.
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47Maurice Kalinowski2010-03-012-1/+2
| |\ \ \
| | * | | Updated .gitignore with the new name of the qmlviewerThorbjørn Lindeijer2010-03-011-1/+1
| | | | |
| | * | | Fixed the close button of the find widget in AssistantThorbjørn Lindeijer2010-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | Done with Christian Kandeler.
| * | | | typo for windows ce exclusion ruleMaurice Kalinowski2010-03-011-1/+1
| |/ / / | | | | | | | | | | | | Reviewed-by: Paul Olav Tvete
| * | | Doc: brief Qt Quick introduction on "What's New" page.Volker Hilsheimer2010-03-011-1/+24
| | | |
| * | | Interview Demo: Fix warning about pixmap leak on X11.Friedemann Kleint2010-03-012-1/+3
| | | | | | | | | | | | | | | | Reviewed-by: Trond Kjernåsen <trond.kjernasen@nokia.com>
| * | | Perform latin1 conversion directly on JSC::UStringKent Hansen2010-03-013-28/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This conversion needs to be as fast as possible since it's performed every time you access a QObject property from QtScript. Hence, we should avoid going via QString and instead do the conversion ourselves. Reviewed-by: Jedrzej Nowacki
| * | | Avoid conversion between JavaScriptCore String type and QStringKent Hansen2010-03-014-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use JSC::UString internally. Only when the public API demands it should a JSC::UString be converted to a QString. Reviewed-by: Jedrzej Nowacki
| * | | Doc: Rephrase documentation for QColor::isValidColor and add \since 4.7.Volker Hilsheimer2010-03-011-3/+5
| | | |
| * | | Use QList::reserve() in QDataStream>>QListAndreas Kling2010-03-011-0/+1
| | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| * | | Added static method isValidColor to QColor.Erik Verbruggen2010-03-012-3/+28
| | | | | | | | | | | | | | | | Reviewed-by: Gunnar Sletta
| * | | compile fix with namespaceshjk2010-03-011-1/+2
| | | |
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47Maurice Kalinowski2010-03-011-2/+1
| |\ \ \
| | * | | qDetectCPUFeatures: compile fix with namespaceshjk2010-03-011-2/+1
| | | | |
| * | | | build fix for WinCEMaurice Kalinowski2010-03-011-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | only use xmlpatterns if Qt is configured to build it Reviewed-by: Paul Olav Tvete
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47Maurice Kalinowski2010-03-013-4/+19
| |\ \ \
| | * | | Mac: using Qt to write plugins disables quit for 3rd party applicationRichard Moe Gustavsen2010-03-011-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that qt_init always installs/overwrites apple event handlers. So if the 3rd party app had already installed an event handler for kAEQuit, then it will be removed when the Qt plugin is loaded. This patch checks (in the carbon case) if event handlers already exists before installing new ones, or, in the cocoa case, avoids installing apple event handlers if the AA_MacPluginApplication is set. In other words, handling quit etc is seen as the responsibility of the app, and not the plugin. Task-number: QTBUG-8087 Reviewed-by: prasanth
| | * | | doc: Fixed building documentationThorbjørn Lindeijer2010-03-011-0/+0
| | | | | | | | | | | | | | | | | | | | qml.qdocconf wasn't renamed yet.
| | * | | Updated syncqt to use relative include paths on cygwin as well.Zeno Albisser2010-03-011-1/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | compile fix for WinCEMaurice Kalinowski2010-03-011-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | do not include headers of disabled modules Reviewed-by: Paul Olav Tvete
generated by cgit v0.12 at 2024-10-25 07:32:40 (GMT)