summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* don't have every generator duplicate the QMAKE_QMAKE logicOswald Buddenhagen2010-03-0310-25/+12
| | | | Reviewed-by: mariusSO
* make the fallback value of QMAKE_QMAKE absoluteOswald Buddenhagen2010-03-031-1/+2
| | | | | | | | inspired by the pbx generator. currently this has no effect, as all generators build their own fallbacks anyway. Reviewed-by: mariusSO
* Application menu is not translated in Mac OS X CocoaPrasanth Ullattil2010-03-036-9/+71
| | | | | | | | | | | The application menu is loaded from the qt_menu.nib which only has English strings. These will now be translated using Qt's own translation mechanism. Every time a new translator is installed, the menu will now try to get the new string. Modification of qt_xx.ts files are done in a different patch. Task-number: QTBUG-4463 Reviewed-by: MortenS
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0348-113/+631
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits) Mac: Select Carbon when using the 10.4u SDK. fix connecting to an ID. make the value of QMAKE_QMAKE somewhat less magic Assistant: Don't warn for non-existing English to English translations. Assistant: Un-watch files at shutdown. Help system: Build search index with low priority. Fixed a regression in the syntax highlighter Add a template specialisation for QArgument when T is a reference. Always run syncqt if using a Git checkout. Added comment about usage of strncpy_s function in VC++ > 14.00 Compile. OS X 10.4 compile error; required casting int to GLint. QtDeclarative: Fix compiler warnings Implement alien widgets on Mac/Cocoa. QDeclarativeView: Add a Designer plugin. QDeclarativeView: Make usable in Designer minor optimization: don't mark contents as dirty if nothing was changed minor optimization: ignore invalid preeditAreaPosition/preeditAreaText remove unused code minor clean-ups and styling fixes ...
| * Mac: Select Carbon when using the 10.4u SDK.Morten Johan Sørvig2010-03-031-0/+9
| |
| * fix connecting to an ID.Lorn Potter2010-03-031-1/+1
| |
| * make the value of QMAKE_QMAKE somewhat less magicOswald Buddenhagen2010-03-021-1/+0
| | | | | | | | | | | | | | | | | | the generators change the value of QMAKE_QMAKE, so it is unwise to "redirect" it to a hidden builtin which is reset each time. in particular, this fixes qmake generating makefiles without an absolute path to qmake itself - the initial quoting of the filename will make the variable "real", so contains() will start working for it.
| * Assistant: Don't warn for non-existing English to English translations.ck2010-03-021-1/+1
| | | | | | | | | | | | They usually don't exist, so we'd just be adding noise otherwise. Reviewed-by: kh1
| * Assistant: Un-watch files at shutdown.ck2010-03-021-0/+7
| | | | | | | | | | | | | | Not strictly needed, but it seems nicer to have a removePath() for every addPath(). Reviewed-by: kh1
| * Help system: Build search index with low priority.ck2010-03-022-2/+2
| | | | | | | | Reviewed-by: kh1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0242-108/+611
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (22 commits) Fixed a regression in the syntax highlighter Add a template specialisation for QArgument when T is a reference. Always run syncqt if using a Git checkout. Added comment about usage of strncpy_s function in VC++ > 14.00 Compile. OS X 10.4 compile error; required casting int to GLint. QtDeclarative: Fix compiler warnings Implement alien widgets on Mac/Cocoa. QDeclarativeView: Add a Designer plugin. QDeclarativeView: Make usable in Designer minor optimization: don't mark contents as dirty if nothing was changed minor optimization: ignore invalid preeditAreaPosition/preeditAreaText remove unused code minor clean-ups and styling fixes don't even try to rehighlight invalid or alien block don't cancel the scheduled complete rehighlight from rehighlightBlock() replace temporary disconnection with a very simple statemachine compile Extended gesture autotest. Fix compilation with namespace. ...
| | * Fixed a regression in the syntax highlighterThorbjørn Lindeijer2010-03-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Caused by merging an old version of merge request 481. This patch updates it to the latest version. Merge-request: 481 Reviewed-by: Ritt Konstantin <ritt.ks@gmail.com>
| | * Merge remote branch 'staging/master' into 4.7Thiago Macieira2010-03-021-0/+2
| | |\
| | | * Fix compilation with namespace.ck2010-03-012-3/+4
| | | |
| | * | Add a template specialisation for QArgument when T is a reference.Thiago Macieira2010-03-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't form references to references, so this is the proper solution. Though apparently GCC figures out somehow to work without it... Task-number: QTBUG-8592 Reviewed-By: Olivier Goffart
| | * | Always run syncqt if using a Git checkout.Thiago Macieira2010-03-021-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
| | * | Added comment about usage of strncpy_s function in VC++ > 14.00Zeno Albisser2010-03-021-0/+4
| | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | * | Compile.Morten Johan Sørvig2010-03-021-0/+1
| | | |
| | * | Merge remote branch 'berlin/4.7' into 4.7Oswald Buddenhagen2010-03-0216-25/+57
| | |\ \
| | | * | compileHarald Fernengel2010-03-011-4/+4
| | | | |
| | | * | Introduce optional qdoc_bootstrapped qmake flagHarald Fernengel2010-03-0115-21/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows building documentation even when cross-compiling. Note that for official documentation, you should always use your host's qdoc3 binary. This qmake option is for testing whether you introduced new qdoc warnings even if you don't have a native build around.
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-0221-78/+531
| | |\ \ \
| | | * | | QtDeclarative: Fix compiler warningsFriedemann Kleint2010-03-024-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class/struct mixups, unused variables. Reviewed-by: Thomas Hartmann <thartman@trolltech.com>
| | | * | | Implement alien widgets on Mac/Cocoa.Morten Johan Sørvig2010-03-029-29/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes alien widgets opt in on a per-widget basis on Mac, set the Qt::WA_NativeWindow flag when creating the widget to enable. Setting this flag on widgets that have native child or sibling NSViews is not supported. The main use case for alien widgets on Mac is to improve performance for applications that have complex user interfaces. Qt can handle thousands of widgets per window, while Cocoa is designed to use a smaller number of NSViews in combination with NSCells and custom control implementations. This commit moves us in the direction of having a few main NSViews with "leaf" qwidgets implemented as a custom control.
| | | * | | QDeclarativeView: Add a Designer plugin.Friedemann Kleint2010-03-024-0/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Acked-by: akennedy <qt-info@nokia.com>
| | | * | | QDeclarativeView: Make usable in DesignerFriedemann Kleint2010-03-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make source a designable property, add missing declarations for enumerations. Reviewed-by: akennedy <qt-info@nokia.com>
| | | * | | minor optimization: don't mark contents as dirty if nothing was changedRitt Konstantin2010-03-021-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 481 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
| | | * | | minor optimization: ignore invalid preeditAreaPosition/preeditAreaTextRitt Konstantin2010-03-021-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 481 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
| | | * | | remove unused codeRitt Konstantin2010-03-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 481 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
| | | * | | minor clean-ups and styling fixesRitt Konstantin2010-03-021-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 481 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
| | | * | | don't even try to rehighlight invalid or alien blockRitt Konstantin2010-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 481 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
| | | * | | don't cancel the scheduled complete rehighlight from rehighlightBlock()Ritt Konstantin2010-03-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if rehighlightBlock() is called just after setDocument() then it is possible that reformatBlocks() will be called just before q_delayedRehighlight() and thus will prevent previously scheduled complete rehighlighting. Merge-request: 481 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
| | | * | | replace temporary disconnection with a very simple statemachineRitt Konstantin2010-03-021-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this also fixes an issue with non-constant ordering of connections to document's contentsChange() signal Merge-request: 481 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
| | | * | | Merge branch 'master-staging1' into 4.7-staging1Denis Dzyubenko2010-03-022-8/+105
| | | |\ \ \
| | | | * | | Extended gesture autotest.Denis Dzyubenko2010-03-012-1/+59
| | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure partial gestures do not propagate further if an item that expects partial gestures received it. Task-number: resulted from QTBUG-6876 Reviewed-by: trustme
| | | | * | Fixed coordinate system conversion for gestures.Denis Dzyubenko2010-03-012-7/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When converting hotspot position (which is in global coordinates) to graphics scene coordinates we should use the viewport because the mapToScene() takes a position in a viewport. Task-number: related to QTBUG-6876 Reviewed-by: Thomas Zander
| | * | | | OS X 10.4 compile error; required casting int to GLint.Martin Smith2010-03-021-4/+4
| | |/ / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-039-74/+230
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compile of some tests with `-qtnamespace' Gstreamer media backend: ensure the null video output is not deleted Use mute property instead of setting volume to 0 if playbin2 is used. Gstreamer playback backend: Start loading media on setMedia(), Fixed compiler warnings when compiling multimedia module.
| * | | | Fixed compile of some tests with `-qtnamespace'Rohan McGovern2010-03-032-0/+11
| | | | |
| * | | | Gstreamer media backend: ensure the null video output is not deletedDmytro Poplavskiy2010-03-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during player session lifetime Reviewed-by: Andrew den Exter
| * | | | Use mute property instead of setting volume to 0 if playbin2 is used.Dmytro Poplavskiy2010-03-031-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTMOBILITY-67 Reviewed-by: Andrew den Exter
| * | | | Gstreamer playback backend: Start loading media on setMedia(),Dmytro Poplavskiy2010-03-034-59/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without waiting for play() or pause(). To keep behaviour consisten with the rest of backends. Reviewed-by: Andrew den Exter
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-033-7/+11
| |\ \ \ \ |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compiler warnings when compiling multimedia module.
| * | | | Fixed compiler warnings when compiling multimedia module.Kurt Korbatits2010-03-033-7/+11
| | | | | | | | | | | | | | | | | | | | Reviewed-by:Andrew den Exter
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0226-657/+986
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix & move QEgl::native* to platform-specific files Updates to changes file 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
| * | | | | 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
generated by cgit v0.12 at 2025-03-11 18:08:30 (GMT)