summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1228-95/+487
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits) Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. QtHelp: Fix auto tests. Fix a crash when unloading libQtCore Introduce a qconfig feature for QtDBus Fix build after MR 543 merged. Compile on 10.4. revert "Fix the Qt build on Mac OS X/Cocoa 64-bit" Remove expected failures after JavaScriptCore bug fix ...
| * Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.Thiago Macieira2010-04-101-0/+4
| | | | | | | | | | | | | | Ossi is right: on WinCE, _setmode is different from regular Windows and the docs... Reviewed-by: ossi
| * the _setmode() prototype is different on win ceOswald Buddenhagen2010-04-091-0/+4
| | | | | | | | | | | | ... both from windows and the wince doc ... Reviewed-by: joerg
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-094-11/+30
| |\
| | * fcntl.h doesn't seem to exist, either - contrary to an example on msdnOswald Buddenhagen2010-04-091-2/+2
| | |
| | * fix compile on winceOswald Buddenhagen2010-04-091-2/+7
| | | | | | | | | | | | Reviewed-by: joerg
| | * remove CONFIG += ordered againOswald Buddenhagen2010-04-091-1/+0
| | |
| | * Assistant: Check namespace and virtual folder syntax of help projects.ck2010-04-081-6/+22
| | | | | | | | | | | | | | | Task-number: QTBUG-4519 Reviewed-by: kh1
| | * Fix build after MR 543 merged.Thiago Macieira2010-04-081-2/+1
| | | | | | | | | | | | | | | | | | | | | qmlviewer is now called simply qml, and the debugger is not in Qt sources anymore. Reviewed-by: Bradley T. Hughes
| * | qdoc: Changed qdoc to output the new doc format.Martin Smith2010-04-0919-45/+351
| |/ | | | | | | Very cool.
| * Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-073-20/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a -no-gui switch to configure, allowing to build Qt without QtGui and components depending on QtGui. This is useful on headless servers, and in using QtCore, QtNetwork, QtXml, QtSql etc. on platforms QtGui hasn't been ported to yet. Task-number: QTBUG-4007 Merge-request: 543 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * Fix missing natively supported mime types for help viewer.kh12010-04-073-19/+61
| | | | | | | | | | Task-number: QTBUG-9651 Reviewed-by: ck
| * qdoc: Added many png, js, and css files for new format.Martin Smith2010-04-0736-1433/+2
| | | | | | | | | | | | Coming soon! Task: QTBUG-9504
| * qdoc: Added many png, js, and css files for new format.Martin Smith2010-04-0737-0/+1438
| | | | | | | | | | | | Coming soon! Task: QTBUG-9504
| * qdoc: Added <div> elements to some html output for Fake nodes.Martin Smith2010-04-061-4/+8
| | | | | | | | Task: QTBUG-9504
* | Add --download option to runonphoneShane Kearns2010-04-071-36/+42
| | | | | | | | | | | | | | | | | | | | | | runonphone --download <remote file> <local file> Can be used to copy files from the phone to the PC. Typical use would be to get a test log, for example: runonphone -s tst_qdir.sis -d c:\data\log.txt c:\temp\log.txt tst_qdir.exe -o c:\temp\log.txt Reviewed-by: Thomas Zander
* | Implement download support to TRK LauncherShane Kearns2010-04-073-24/+200
|/ | | | | | | | | | | Use the TRK protocol to copy a file from the phone to PC after running the executable. This can be used for example to download a log file containing test results. Submitted upstream as commit 9b65c244d7027d78f0b40450961eab68680d6269. Reviewed-by: Friedemann Kleint
* Make it possible to build QtDBus and its tools on Windows CE.Thiago Macieira2010-04-051-5/+0
| | | | | | | This of course requires installing libdbus compiled for Windows CE too. Task-number: QTBUG-9582 Patch-by: Romain Pokrzywka (from KDAB)
* Fix compilation: Linguist uses QtDeclarative .cpp and private headersThiago Macieira2010-04-021-1/+1
|
* Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-019-42/+222
|\ | | | | | | | | | | | | Conflicts: examples/declarative/proxywidgets/proxywidgets.pro examples/declarative/widgets/mywidgets.pro examples/declarative/widgets/widgets.pro
| * Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-0114-225/+457
| |\ | | | | | | | | | | | | Conflicts: src/gui/text/qstatictext.cpp
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-319-42/+222
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (60 commits) Total makeover of SVG image reader Add a QGraphicsItem::updateMicroFocus() to QGraphicsItem. Micro optimization after feedback from Jan-Arve. Show only one dialog when using QFileDialog on Mac. Re-fix compilation: re-add symbols introduced in Qt 4.6.3 to Qt 4.7 Fix bad merge from 4.6. Doc: Updated the qdoc manual with i18n info. Fixed a code example. Fix QStaticText test on Mac Support the pen set on the painter in QStaticText when using rich text Fix setting font for QStaticText on Linux and Mac Hack .pro files on windows to define QT_NO_EGL Fix QDate::isLeapYear() for years < 1 One more test for chinese codecs QScript: More missing APIShim QScriptEngine: Fix reentrency involving creation and desctructions of QScriptEngines Work-around Symbian 10.1's broken egl.h Add some #warnings to debug Symbian EGL build failure Don't detect EGLImage presence by testing function pointers Implement proper QStaticText support in QPaintBuffer Make QStaticText layout lazy ...
| | * \ Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7Olivier Goffart2010-03-311-2/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc src/gui/graphicsview/qgraphicswidget.h
| | * | | Doc: Updated the qdoc manual with i18n info. Fixed a code example.David Boddie2010-03-302-18/+90
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-301-17/+16
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/ds9/iodevicereader.cpp
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-307-24/+132
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (47 commits) QScript: More missing APIShim QScriptEngine: Fix reentrency involving creation and desctructions of QScriptEngines Work-around Symbian 10.1's broken egl.h Add some #warnings to debug Symbian EGL build failure Don't detect EGLImage presence by testing function pointers Implement proper QStaticText support in QPaintBuffer Make QStaticText layout lazy Change QStaticText::setMaximumSize() to setTextWidth() Respect QPainter::pen() in QPainter::drawStaticText() QVarLenghtArray: add some API to be consistant to QVector Don't try to resolve EGLImage function pointers if they are defined Change ORs to ANDs when checking EGLImage extension defines Protect EGLImage function definitions in #ifdef Fix a bug in greek shaping causing infinite loops Define QT_NO_EGL in configure.exe improve mingw 64 bit support Fix build on Windows Round instead of ceil font metrics when ForceIntegerMetrics is enabled cetest: remove source file duplicates from cetest.pro Remove EGLImage create/destroy resolving from VG pixmap data ...
| | | * | | | Define QT_NO_EGL in configure.exeTom Cooksey2010-03-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the "proper" fix for the windows build failure introduced by 75bb84ac. a44026a3 should be reverted once configure.exe is rebuilt to incorperate this fix. Reviewed-By: Marius Storm-Olsen
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-266-24/+128
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (29 commits) cetest: remove source file duplicates from cetest.pro Remove EGLImage create/destroy resolving from VG pixmap data Avoid having to create temporary QPixmaps when binding to texture Implement Texture-From-Pixmap using EGLImage extensions on X11/EGL Stabilize tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint QMetaObject::normalizeType: Fix parsing of type which contains "const" in names QMetaObject::normalizeType: fix uses of const and template. Synchronize rich text and plain text code paths in QStaticText Paintbuffer single frame profiling. Optimized ARGB32PM on RGB16 blending with opacity using NEON. Optimized SourceOver and 16 bit dest fetches, dest stores using NEON. Optimized scaled/transformed image blending for ARGB32PM and RGB16 on RGB16. Included ARM NEON optimizations from pixman in Qt. Safeguard the colortable access when converting corrupted indexed8 Fix QItemDelegate::textRectangle Fix bad merge Fix wrong arguments order in a warning in QObject::moveToThread Fix warnings and build on mingw Fixes a deadlock with streaming in Phonon. cetest build fix ...
| | | | * | | | cetest: remove source file duplicates from cetest.proJoerg Bornemann2010-03-261-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | epocroot.cpp and registry.cpp are already in qmake_include.pri
| | | | * | | | Paintbuffer single frame profiling.Samuel Rødal2010-03-261-9/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new --instrumentframe=X argument which gives a detailed run-down of how many milliseconds each paint command of that frame takes. Reviewed-by: Gunnar Sletta
| | | | * | | | Fix bad mergeOlivier Goffart2010-03-251-15/+7
| | | | | | | |
| | | | * | | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-2519-172/+383
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/generator.cpp tools/qdoc3/node.cpp
| | | | * | | | | Fix warnings and build on mingwThierry Bastian2010-03-252-5/+5
| | | | | | | | |
| | | | * | | | | cetest build fixJoerg Bornemann2010-03-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introducing a new define for building qmake without generators. QT_BUILD_QMAKE_NO_GENERATORS is used for cetest and the qmake COM wrapper of the Visual Studio Add-in. Reviewed-by: mauricek
| | | | * | | | | cetest build fix for TCP sync connectionJoerg Bornemann2010-03-252-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mauricek
* | | | | | | | | Fix compilation on solaris-g++: ctype functions are sometimes macrosThiago Macieira2010-04-012-4/+4
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least with g++ 3.4 on Solaris, they are. So you can't write ::isalpha because that expands to something invalid. Reviewed-by: Trust Me
* | | | | | | | handle qt-format PO flagsOswald Buddenhagen2010-03-311-1/+24
| | | | | | | |
* | | | | | | | handle encoding of PO filesOswald Buddenhagen2010-03-311-134/+202
| | | | | | | |
* | | | | | | | make variable naming politically correct :-DOswald Buddenhagen2010-03-311-4/+4
| | | | | | | |
* | | | | | | | add Plural-Forms header in PO writerOswald Buddenhagen2010-03-316-26/+65
| | | | | | | |
* | | | | | | | simplify arabic plural ruleOswald Buddenhagen2010-03-311-1/+1
| | | | | | | |
* | | | | | | | don't mark untranslated messages as fuzzy in PO filesOswald Buddenhagen2010-03-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... as this is what gettext processors expect.
* | | | | | | | support gettext POT filesOswald Buddenhagen2010-03-311-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these are in fact the same as PO files, only that exporting to one automatically drops translations.
* | | | | | | | fix writing of length variant separators in the singular caseOswald Buddenhagen2010-03-311-0/+2
| | | | | | | |
* | | | | | | | make PO header handling less of a monster hackOswald Buddenhagen2010-03-311-44/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of doing string editing magic, parse the header properly. don't add a template file comment, either - it's not mandatory, after all.
* | | | | | | | fix updating of X-Source-Language PO headerOswald Buddenhagen2010-03-311-0/+3
| | | | | | | |
* | | | | | | | interpret source language "en" as "POSIX" (more precisely: "none specified")Oswald Buddenhagen2010-03-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we set it to that value when writing xliff, as the header is mandatory and no better value is possible. it seems unlikely that an unqualified "english" would be used if somebody meant to actually specify a source language, so this hack should be ok.
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-317-44/+89
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits) Fix compilation with Sun CC: no semi-colon after Q_ENUM. Remove the "Insert unicode control character" menu entry on X11. adds a timeout option to QThreadPool::waitForDone(); Remove leading whitespace from Qt header macros. Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch. Add QDateTime members that operate on 64-bit milliseconds. Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct. qdoc: Added <div> elements to some html output for class references. Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now ...
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-307-44/+89
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits) qdoc: Added <div> elements to some html output for class references. Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now Fixed a typo in the QDoubleValidotor doc. Trivial fix to JavaScriptCore to fix building with MSVC 2010 Autotest: oops, fix oops: remove qguard from auto.pro Autotests: oops, remove last traces of QGuard Remove QGuard. Unskip test that used to crash QtScript: Add yet more missing API shims ...
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-303-4/+12
| | |\ \ \ \ \ \