summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* don't construct a new message for look-up purposes onlyOswald Buddenhagen2009-11-063-13/+5
|
* Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-063-1/+10
|\
| * 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-061-1/+5
| | |_|/ | |/| | | | | | | | | | Reviewed-by: Warwick Allison
* | | | Assistant: Fixes related to search configuration.ck2009-11-062-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Remove superfluous definition of QT_CLUCENE_SUPPORT in assistant.pro. It was not evaluated anywhere. 2. Bugfix for searvh widget when working with non-CLucene search lib. Reviewed-by: kh1
* | | | Assistant: Fix bugs on cached collection file handling.ck2009-11-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. When the dates between the caller-supplied and the cached versions of a collection file differed, we used to overwrite the cached with the original version. This was obviously wrong - we should only overwrite when the cached version is older. 2. We also forgot to set the zoom factor when overwriting. Task-number: QTBUG-4899 Reviewed-by: kh1
* | | | Assistant: Reset default homepage on collection file update.ck2009-11-051-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: kh1
* | | | Assistant: Look for document encoding in XML headers as well.ck2009-11-056-57/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-1770 Reviewed-by: kh1 Conflicts: tools/assistant/lib/lib.pro
* | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-0415-46/+107
|\| | |
| * | | 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
* | | | | add -markuntranslated optionOswald Buddenhagen2009-11-043-16/+29
| | | | | | | | | | | | | | | | | | | | maemo *really* want it, so pushing it in now ...
* | | | | reshuffle command line parsingOswald Buddenhagen2009-11-041-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | collect the files into a string list during the initial run instead of iterating the argument list twice.
* | | | | construct ConversionData earlierOswald Buddenhagen2009-11-041-31/+21
| | | | | | | | | | | | | | | | | | | | to avoid the insane number of function arguments in a few places
* | | | | don't break on unterminated C commentsOswald Buddenhagen2009-11-041-1/+1
| | | | |
* | | | | introduce delayed resolution of aliasesOswald Buddenhagen2009-11-041-16/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this has two effects: - using-declarations which use forward-declared classes work without collecting the forward declarations, as the resolution happens at a place where the class definition must have been encountered already - it should be a bit faster
* | | | | fix bogus "Class '<foo>' lacks Q_OBJECT macro"Oswald Buddenhagen2009-11-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the optimization not to look for parent definitions if we already knew that there would be none did not consider that we only know that the leaf node is missing, not any intermediate nodes.
* | | | | namespaces can have parents, tooOswald Buddenhagen2009-11-041-5/+10
| | | | |
* | | | | Fix Assistant to never access the network.kh12009-11-041-17/+15
|/ / / / | | | | | | | | | | | | | | | | Task-number: QT-1684 Reviewed-by: ck
* | | | 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