summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6-s60' into 4.6axis2009-11-062-0/+5
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-051-1/+1
| |\
| * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0415-43/+106
| |\ \
| * | | Added UIDs to projects lacking themMiikka Heikkinen2009-11-042-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Also added symbianpkgrules.pri include to some examples Reviewed-by: Janne Koskinen
* | | | Make declarative support in configure.exe auto.Martin Jones2009-11-051-1/+5
| |_|/ |/| | | | | | | | Reviewed-by: Warwick Allison
* | | eval: add key for the installer to grep for.Daniel Molkentin2009-11-041-1/+1
| |/ |/| | | | | Reviewed-By: con
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-0413-24/+89
|\ \
| * \ Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-041-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/gui/kernel/qevent.h
| | * | Removed the margin in assistant on Mac.Denis Dzyubenko2009-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 9551b8c349ce4e15a57c24a2408ee1b73c2b7510 enabled documentMode on the tabbar in Assistant. To make it look more native we also remove the margin around the tabwidget. Reviewed-by: Prasanth
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Bradley T. Hughes2009-10-301-0/+1
| | |\ \
| * | | | Declarative building infrastructure.Warwick Allison2009-11-042-0/+13
| | | | | | | | | | | | | | | | | | | | Does nothing if no declarative directories installed.
| * | | | qdoc updates for QMLWarwick Allison2009-11-0410-23/+75
| | | | | | | | | | | | | | | | | | | | Reviewed-by:Michael Brasser
* | | | | qdoc: Fixed XHTML breakage caused by the Google search bar markup.David Boddie2009-11-031-2/+2
|/ / / / | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-032-16/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/network/ssl/qsslerror.cpp
| * | | | qdoc3: Fixed a linking error for qml properties.Martin Smith2009-10-292-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This: https://qtmetrics.europe.nokia.com/kinetic-declarativeui/qml-item.html#rotation-prop should now be this: https://qtmetrics.europe.nokia.com/kinetic-declarativeui/qml-item.html#transformOrigin-prop)
* | | | | Prepend qt_instdate when using configure.exe as well. Rebuilt configure.exeDaniel Molkentin2009-11-031-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Rebuilt using VS2008. Reviewed-By: Alessandro Portale
* | | | disable link time code generation by default on Windows CEJoerg Bornemann2009-11-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To be consistent with desktop Windows Qt, we also disable LTCG by default. To turn it on, use the -ltcg configure switch. Reviewed-by: mauricek
* | | | qdoc: Disabled reporting the NOTIFY signal until I know what it broke.Martin Smith2009-11-031-1/+0
| | | | | | | | | | | | | | | | Task-number: 259071
* | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-024-15/+34
|\ \ \ \
| * | | | Compilation failure QtOpenGL when Opengl ES is used on Qt for Windows CEKeith Isdale2009-11-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable building egl/qegl_wince.cpp when a wince* mkspec is used Add "egl" to QT_CONFIG when any of the OpenGL ES variants is used Task-number: QTBUG-5073 Reviewed-by: Trond Kjernåsen
| * | | | Add a French translation to Assistant. Update the phrase book.Benjamin Poulain2009-10-302-0/+21
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Pierre Rossi
| * | | | Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstreamBradley T. Hughes2009-10-301-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Tabs with corner widgets are drawn incorrectly in document mode on Mac.Prasanth Ullattil2009-10-291-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While drawing the tabbar frame, mac style needs the QTabBar pointer to calculate the correct size. Since the QTabWidget also uses the PE_FrameTabBarBase to draw background of the corner widgets, the mac style has to use position passed with the style option. This only works with horizontal tabs. Reviewed-by: Jens Bache-Wiig
| * | | Merge branch '4.6-s60' into 4.6axis2009-10-301-15/+9
| |\ \ \ | | |_|/ | |/| |
| | * | Removed mentions about certain flags being temporary for SymbianMiikka Heikkinen2009-10-291-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In configure app, some QT_NO_* flags were indicated to be temporary and should be removed once Qt for Symbian is out, but it looks like at least some of them will be there for longer haul, so removed mentions of temporary nature of these flags. Task-number: QTBUG-4744 Reviewed-by: Janne Anttila
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-294-159/+20
| | |\ \
| | * | | Enable webkit and xmlpatterns by default on Symbian.Frans Englich2009-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | Suggested by Lars, OK'd by Jason, Kristian and Shane.
* | | | | Make Linguist on Mac use the unified toolbar, like Assistant.Daniel Molkentin2009-10-301-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Oswald Buddenhagen
* | | | | Merge commit 'mainline/4.6' into 4.6hjk2009-10-306-161/+46
|\ \ \ \ \ | |/ / / /
| * | | | Fix wrong version number in Assistant internal help.kh12009-10-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-1522 Reviewed-by: kh
| * | | | do not crashOswald Buddenhagen2009-10-291-5/+7
| | | | |
| * | | | Also change the configure.exe to ensure that the necessary new configsThiago Macieira2009-10-291-1/+23
| | |/ / | |/| | | | | | | | | | | | | | | | | | are generated Reviewed-By: Daniel Molkentin
| * | | make magic comment parsing stricterOswald Buddenhagen2009-10-281-9/+9
| | |/ | |/| | | | | | | | | | | | | there must be a space after the //: and similar comments, otherwise harmless comments of the sort of //====== foo here ===== will be parsed as message ids, etc.
| * | Add 800x480 to the qvfb configuration dialogRhys Weatherley2009-10-282-1/+11
| | | | | | | | | | | | | | | | | | | | | 800x480 is an increasingly common screen size on embedded devices, and specifying it via Custom sizes is annoying. Reviewed-by: Sarah Smith
| * | Doc: Remove unused file.David Boddie2009-10-271-149/+0
| |/ | | | | | | Reviewed-by: Trust Me
* | Designer: Fix potential crash when moving pages of a QTabWidgetFriedemann Kleint2009-10-271-0/+3
|/ | | | | | | ... which has movable=true, conflicting with its internal drag and drop. Introduce 'movable' as fake property. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QT-1788
* Doc: Updated the modules for the "Desktop" (Full Framework) edition.David Boddie2009-10-231-1/+1
| | | | Reviewed-by: Trust Me
* qdoc3: Added the \qmlattachedsignal and \qmlattachedmethod.Martin Smith2009-10-234-14/+72
| | | | They works just like the \qmlsignal and \qmlmethod commands.
* consider message id when comparing messagesOswald Buddenhagen2009-10-221-2/+6
|
* id-based: do not drop unfinished untranslated messagesOswald Buddenhagen2009-10-221-1/+1
| | | | otherwise the fallback to use the source string is rather pointless
* id-based: use source strings instead of empty translations only for ↵Oswald Buddenhagen2009-10-221-3/+4
| | | | unfinished messages
* actually guess the target language from the file nameOswald Buddenhagen2009-10-221-0/+2
| | | | --help says it does, but it didn't really.
* Assistant: More useful error messages for help collections.ck2009-10-211-6/+8
|
* Revert "Switch from *-armv5 to *-armv6."Frans Englich2009-10-211-1/+1
| | | | | | | | | This reverts commit a6af1538ea53408399fb29870a4ef16a92c7893a. armv6 is not supported by public SDKs, due to armv6/urel not existing. Such SDKs needs to be fixed by copying the armv5 files. Hence we revert, and postpone until we have SDKs which actually support armv6, and until we have a stronger insight into what advantages armv6 brings.
* Switch from *-armv5 to *-armv6.Frans Englich2009-10-211-1/+1
| | | | | | | | Change from armv5 to armv6 by default. This updates documentation, the convenience scripts, and the Raptor/abld qmake generator to use armv6 instead. Task-number: QTBUG-4891 Reviewed-by: Jason Barron
* Assistant: Fix syntax error.ck2009-10-201-1/+1
| | | | | The offending code is normally ifdef'ed out, so the bug did not manifest itself before.
* qdoc3: Added the \qmlattachedproperty command.Martin Smith2009-10-195-17/+56
| | | | | | It works just like the \qmlproperty command, except that it puts the properties in a different section for attached properties.
* Fixed `-debug' option to cetest deploying release DLLs.Rohan McGovern2009-10-161-0/+2
| | | | | | | | | | | | cetest was processing .pro files without build_pass set. That's wrong, as it means the qmake logic is set up for generating the debug-and-release glue project instead of the real project. Until commit 75b41faff44a1488d88eca6e910d4b617cb42221, it didn't matter. After that commit, cetest would always try to deploy release versions of Qt DLLs even when run with `-debug'. Reviewed-by: joerg
* Remove qdocconf files for the old mac-specific source package.Jason McDonald2009-10-153-35/+0
| | | | | | | These files are not used for the qt-everywhere source packages, and the platform-specific source packages are no longer needed. Reviewed-by: Trust Me
* Synced QT_BUILD_PARTS in .qmake.cache and projects.pro for Symbian.Miikka Heikkinen2009-10-141-0/+3
| | | | | | | | | | Projects.pro is forcing QT_BUILD_PARTS to omit docs and translations, but configure still outputted those into .qmake.cache. Fixed configure to also omit them for Symbian builds to make building demos work equally whether built by from root or not. Task-number: QT-1018 Reviewed-by: axis