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-03-1519-81/+184
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits) different approach to fixing "the other" aliasing issue fix aliasing issue in node_construct() detach in fewer cases, remove redundant calculation SSL: Fix memleak related to local certificate Improve keyboard layout detection on X11 Compile on ARM with -Werror -Wold-style-cast Use the vista-style native dialog for QFileDialog::getExistingDirectory Apply the stdset attribute for resource properties doc: Completed sentence about HideNameFilterDetails Doc fix in QLocale Doc for for QGestureRecognizer::create. Fix broken setCollectionFile (creating multiple models instead reusing) Enable the fast paths when converting to Rgb565 qdoc: ifdefed out all the debug code. Add missing QtScript API shims Further fix license whitespace. Remove NetworkManager test-bed application. Remove configure test for NetworkManager. Fix QDir::entryList regression Add DEFINES to mingw32/windres.exe command line. ...
| * Apply the stdset attribute for resource propertiesJarek Kobus2010-03-151-3/+8
| | | | | | | | | | | | | | | | In case of resource property we recreate a dom property using resource builder. We had forgot to apply stdset attribute for that case. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-8881
| * Fix broken setCollectionFile (creating multiple models instead reusing)kh12010-03-153-10/+13
| | | | | | | | Reviewed-by: ck
| * qdoc: ifdefed out all the debug code.Martin Smith2010-03-159-9/+17
| | | | | | | | | | I think the crash that occurs when running qdoc over multiple qdocconf files is fixed.
| * Fix SetDialogPreference build error on Symbian.Morten Johan Sørvig2010-03-121-1/+1
| | | | | | | | | | Similar to 032d4ac63687d209ffef594bf6ef60e3db20bfa3.
| * CompileKent Hansen2010-03-111-1/+1
| |
| * Add a placeholder text into the new search lineeditHarald Fernengel2010-03-111-0/+1
| |
| * Ui improvements to QDBusViewer.Stephen Kelly2010-03-112-32/+54
| | | | | | | | | | | | | | | | * Add resizeable splitters instead of layouts to divide up the screen. * Add a filtering line edit to find services of interest. Merge-request: 2304 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * Make double-clicking a d-bus method work againHarald Fernengel2010-03-111-0/+1
| | | | | | | | | | Last merge request forgot to update the D-Bus structure in case of double-click.
| * Changed Qdbusviewer to match D-Bus type signature in addition to method name ↵Kimmo Kotajärvi2010-03-114-1/+30
| | | | | | | | | | | | | | when finding a method. Merge-request: 435 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * qdoc: Added debug code.Martin Smith2010-03-116-0/+7
| |
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-114-29/+35
| |\
| | * configure.exe: Fix inverted logicMarius Storm-Olsen2010-03-111-1/+1
| | | | | | | | | | | | Reviewed-by: Rohan McGovern
| | * Fixed the QML browser built into the QML viewerThorbjørn Lindeijer2010-03-101-5/+5
| | | | | | | | | | | | Was still using 'matchProperties' instead of just 'properties'.
| | * Make configure.exe fail for declarative if no script supportMarius Storm-Olsen2010-03-101-15/+27
| | | | | | | | | | | | | | | | | | | | | If the user tells configure not to compile QtScript, then fail if the user wants QtDeclarative or QtScriptTools Reviewed-by: Jørgen Lind
| | * Assistant: Fix full text indexing.ck2010-03-092-9/+3
| | |
| * | qdoc: Fixed lookup of QML property nodes.Martin Smith2010-03-113-2/+23
| |/ | | | | | | | | At this point, no QML qdoc errors appear in the output. There is still a lot of debug output.
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-152-1/+2
|\ \ | |/ |/| | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| * isalpha() is unspecified for values outside uchar and EOFOswald Buddenhagen2010-03-111-1/+1
| | | | | | | | Task-number: QTBUG-8907
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-101-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed paint crash in Symbian for trasnclucent dialogs. Implemented QLibraryInfo::TranslationsPath for Symbian.
| | * Implemented QLibraryInfo::TranslationsPath for Symbian.Janne Anttila2010-03-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Discussed with QtProd and they agreed "/resource/qt/translations" would be suitable path to return from QLibraryInfo::TranslationsPath. Task-number: QTBUG-8291 Reviewed-by: Miikka Heikkinen
* | | Assistant: Fix compile warning for empty header.ck2010-03-086-29/+17
| | | | | | | | | | | | Reviewed-by: kh1
* | | qdoc: Clear a static multimap after each qdocconf file.Martin Smith2010-03-083-0/+11
| | | | | | | | | | | | Task: QTBUG-8804
* | | qdoc: Added some debug output to track down a crashMartin Smith2010-03-081-2/+2
| | | | | | | | | | | | The crash doesn't happen on my OS X 10.4.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-074-88/+95
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (57 commits) fix corewlan detection error when building for 10.5 when 10.6 is also fixed treatment of zlib on Mac when crossbuilding Partial overloading support for qdbus cli tool. Allow empty authority in QUrl::setAuthority as per docs. Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority. fixed case of GL include directory check in MAC_APPLICATION_MENU translations Re-generate the Unicode tables after updates to the program that generates them Fix the code after merge: DerivedNormalizationProps has two or more columns add some usefull definitions to qunicodetables_p.h qchar.cpp: fix identation finish last commit prefer DerivedNormalizationProps.txt over CompositionExclusions.txt improve error reporting a bit more improve error reporting fix incorect condition check if string to int conversions were done w/o errors improve error reporting for unassigned grapheme/word/sentence break classes avoid using of qunicodetables_p.h in generator use QHash for line break map ...
| * | | Partial overloading support for qdbus cli tool.Kimmo Kotajärvi2010-03-051-84/+91
| | | | | | | | | | | | | | | | | | | | Merge-request: 432 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | Assistant: Fix warnings about unused variables.ck2010-03-053-4/+4
| | | |
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-063-9/+66
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * | fix "using namespace" recursion crashOswald Buddenhagen2010-03-051-8/+20
| |/ | | | | | | Task-number: QTBUG-8360
| * update russian translations and phrasebookRitt Konstantin2010-03-021-0/+40
| | | | | | | | | | Merge-request: 485 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Help system: Build search index with low priority.ck2010-03-012-2/+2
| | | | | | | | Reviewed-by: kh1
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-011-1/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Preparation to enable OpenGLES 2.0 for Windows Mobile. Test modifications for the Windows Mobile platform. QAbstractItemView::setIndexWidget: remove the old widget from the QSet of persistent editors Fixed qgl autotest failures on Maemo. Skip complex FBO tests if combined depth-stencil isn't supported
| | * Test modifications for the Windows Mobile platform.ninerider2010-02-271-1/+6
| | | | | | | | | | | | | | | | | | Test were changed to run in reasonable time on Windows Mobile. Also some test were skipped for instance those using OpenGL. OpenGL support for Windows Mobile is a forthcoming feature.
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-261-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: fix "configure -fast" on Windows for other maketools than nmake
| | * fix "configure -fast" on Windows for other maketools than nmakeJoerg Bornemann2010-02-261-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-8562 Reviewed-by: ossi
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0530-38/+322
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits) Doc: Enabled the context menu in the spreadsheet demo. Updated URLs. Doc: Applied suggestion for an improvement to the foreach documentation. Doc: Added a note about the lack of standard file copy/paste on X11. Doc: Fixed the row number for a widget in two parts of the tutorial. Doc: Fixed typos. Reduce compiling time of QScriptValue autotest suite on Windows. Optimize QScriptValue autotest generator. Set database write behavior to synchronous=OFF and increase page cache. doc: Fixed some qdoc errors. Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text. Allow building documentation without all of Qt Added a documentation for the new enum value in gesture api. Remove the OBJECTS_DIR variable assignment from some projets in Qt. Fix compile qmake/MinGw: Link statically for Qt Creator to be able to detect it. Enable two fast path for blend_tiled_rgb565 Avoid QString reallocation for smallcaps fonts in Itemizer::generate() Make QLabel::text a reloadable property remove non wifi interfaces from being handled. ...
| * | | Updated URLs.Robert Loehning2010-03-041-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
| * | | Set database write behavior to synchronous=OFF and increase page cache.kh12010-03-042-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the INSERT performance dramatically, since we won't wait anymore until all data is written back to the database. Should not have any impact on the database consistency in case of an app crash, only in case the whole OS crashes, but then you might be in trouble anyway. Reviewed-by: ck
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-044-4/+16
| |\ \ \
| | * | | Remove the OBJECTS_DIR variable assignment from some projets in Qt.Jocelyn Turcotte2010-03-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevent debug and release object file to be mixed up when linking these application in a debug_and_release configured Qt. Reviewed-by: Marius Storm-Olsen
| | * | | Fix compileJarek Kobus2010-03-041-0/+1
| | | | | | | | | | | | | | | | | | | | Missing header added
| | * | | Make QLabel::text a reloadable propertyJarek Kobus2010-03-043-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this way we can correctly load / reload a label in case it contains a rich text with a reference to the image taken from resources. Since QLabel::setText() ignores the call in case we try to set the same text, we force the reload by setting the empty string in between. For performance reasons we do it only in cases when the text value contains :/ (only in this case it might have a reference to the resources). Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-8347
| * | | | doc: Fixed some qdoc errors.Martin Smith2010-03-041-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The QtMultimedia module needed to have its own \page unique name so that the QtMultimedia \module would not conflict with the QtMultimedia \namespace.
| * | | qdoc3: Trying to find a bug that causes a crash.Martin Smith2010-03-032-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't crash on OS X, but it does on some other platforms. If you run into this crash running qdoc3, you can work around it by commenting out line 1539 in tools/qdoc3/htmlgenerator.cpp The line to comment out is: generateQmlInheritedBy(qml_cn, marker);
| * | | 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
| * | | Compile.Morten Johan Sørvig2010-03-021-0/+1
| | | |
| * | | Merge remote branch 'berlin/4.7' into 4.7Oswald Buddenhagen2010-03-0215-21/+53
| |\ \ \
| | * | | 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.
generated by cgit v0.12 at 2025-01-06 05:31:35 (GMT)