summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Don't double call classBegin() Notify QML internal notifiers of item geometry changes before QML signal handlers. Revert "Add 'cached' property to Image." Add 'cached' property to Image. Ensure Flickable visibleArea is updated when view height changes Improve calling QML functions from C++ docs. Add missing license headers Remove debug. Snake: Don't use Behavior with states. QML Viewer should be put under QtDemos instead of QtExamples folder in Symbian app menu Fix application exiting in embedded qml examples QDeclarativeDebug: Destroy incoming connections if already connected Simplify type management code QML JavaScript .import parser Fix VisualDataModel model update handling when rootIndex is specified. Improve test reliability when running in parallel with other tests. Improve stability of test on loaded hw. Improve stability of test on loaded hw.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-301-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove debug. Snake: Don't use Behavior with states. QML Viewer should be put under QtDemos instead of QtExamples folder in Symbian app menu Fix application exiting in embedded qml examples QDeclarativeDebug: Destroy incoming connections if already connected Fix VisualDataModel model update handling when rootIndex is specified. Improve test reliability when running in parallel with other tests. Improve stability of test on loaded hw. Improve stability of test on loaded hw.
| | * QML Viewer should be put under QtDemos instead of QtExamples folder in ↵Joona Petrell2010-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | Symbian app menu Task-number: Reviewed-by: Martin Jones
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-305-40/+74
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix #pragma message(), the message must be enclosed in parentheses preserve non-standard source references QSslConfiguration: fix crash when accessing null pointer properly parse ts contexts in obsolete messages move the MAGIC_OBSOLETE_REFERENCE hack to the xlf file handler Fix static build on Windows with MinGW. Reenable the reporting of CPU features. make qdoc3 boot-strappable again fix MinGW cross compilation with -debug-and-release Updated and new Slovenian translations for Qt 4.7 Designer: Fix crash on unsupported Language/Country combination. Doc: Fixed qdoc warnings and generalized the date and time descriptions. Doc: Whitespace fixes. Doc: Fixed snippets in QML introduction broken in an earlier commit. doc: Fixed numerous qdoc warnings.
| * | preserve non-standard source referencesOswald Buddenhagen2010-08-301-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | the PO format doc suggests that all references are in filename:linennumber format, but some tools seem to deviate from that. so do our best to preserve such references, even if we can't do anything with them. Task-number: QTBUG-9488
| * | properly parse ts contexts in obsolete messagesOswald Buddenhagen2010-08-301-0/+2
| | |
| * | move the MAGIC_OBSOLETE_REFERENCE hack to the xlf file handlerOswald Buddenhagen2010-08-302-8/+15
| | | | | | | | | | | | | | | after all, it is pretty much specific to xlf files, even if the problem majorly concerns converted po files.
| * | make qdoc3 boot-strappable againHarald Fernengel2010-08-301-0/+1
| | |
| * | Designer: Fix crash on unsupported Language/Country combination.Friedemann Kleint2010-08-301-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | ...in the property editor (QLocale). Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Task-number: QTBUG-13267 Task-number: QTCREATORBUG-2212
| * | Doc: Whitespace fixes.David Boddie2010-08-271-23/+23
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-272-6/+6
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (374 commits) Add a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen. Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush. use QFile:map instead of ::mmap Do not use global static const references to objects Revert "Refactor blend_transformed_bilinear to simplify the blend type checking" Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition. Refactor blend_transformed_bilinear to simplify the blend type checking Note RTL behavior changes in docs and changelog Implement qt_memfill32 with Neon. Implement the composition mode Plus with Neon. Fix the broken unicode detection of ODBC driver. Doc: Fixed qdoc warnings. Doc: updating getting started docs - not finished Make it possible again to build Qt without webkit Doc: fixing creator bugs, removing menus and textbox in the header Fixing qdoc index file...Commit hack to work around the massive amounts of dependencies in the upstream branch. Doc: Fixing overlapping text in header list Use Ctrl rather than Alt for switching tabs in the demo browser Doc: add link to new gettings started to index.html Doc: Fixing bug involving header misplacement in Creator style ...
| * Do not use global static const references to objectsOlivier Goffart2010-08-262-6/+6
| | | | | | | | They don't compile with clang
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-265-68/+446
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits) Autotest: don't use Q_FUNC_INFO for testing which method got called fix generated makefile dependencies Cocoa: Demo browser can get stuck after closing modal dialog Restore default if to system default on session close. tst_qmake doesn't need QtGui Use the full path to qmake in the qmake unit test qdoc: Fixed erroneous links to QML basic types. Fixed item view background color in Gtk style scope fixes and clutter reduction for sql driver projects I don't know why some linkers can't call this function, so comment it out. QNetworkSession::close() method now send closed() signal while faking disconnection. Add the missing license headers to the QString benchmark data Fix building of qsimd.cpp on Windows CE Use QElapsedTimer for the benchlib tests. Properly implement the CPU feature disabling in qsimd.cpp. Report the detected CPU features in the corelib boilerplate Detect CPU features on ARM by reading the ELF auxvec. Split the CPU-detection code into multiple functions for readability Fixed delivering gestures to a toplevel widget. Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result ...
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-255-68/+446
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (55 commits) qdoc: Fixed erroneous links to QML basic types. Fixed item view background color in Gtk style scope fixes and clutter reduction for sql driver projects I don't know why some linkers can't call this function, so comment it out. QNetworkSession::close() method now send closed() signal while faking disconnection. Add the missing license headers to the QString benchmark data Fix building of qsimd.cpp on Windows CE Use QElapsedTimer for the benchlib tests. Properly implement the CPU feature disabling in qsimd.cpp. Report the detected CPU features in the corelib boilerplate Detect CPU features on ARM by reading the ELF auxvec. Split the CPU-detection code into multiple functions for readability Fixed delivering gestures to a toplevel widget. Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result Don't try to compile the SSE2 and SSSE3 code with compilers that don't support them (e.g. ARM) Improve on the SSSE3 with alternate aligning function. Add the beginnings of a new SSSE3-based aligning algorithm Small fixup Update the SSSE3-with-alignment function to use aligned loads. Add an ucstrncmp that uses SSSE3 with aligning. ...
| | * qdoc: Fixed erroneous links to QML basic types.Martin Smith2010-08-251-2/+9
| | | | | | | | | | | | Task-nr: QTBUG-13096
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-244-66/+437
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits) Use QElapsedTimer for the benchlib tests. Properly implement the CPU feature disabling in qsimd.cpp. Report the detected CPU features in the corelib boilerplate Detect CPU features on ARM by reading the ELF auxvec. Split the CPU-detection code into multiple functions for readability Fixed delivering gestures to a toplevel widget. Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result Don't try to compile the SSE2 and SSSE3 code with compilers that don't support them (e.g. ARM) Improve on the SSSE3 with alternate aligning function. Add the beginnings of a new SSSE3-based aligning algorithm Small fixup Update the SSSE3-with-alignment function to use aligned loads. Add an ucstrncmp that uses SSSE3 with aligning. Add an SSSE3 version of ucstrncmp Optimise the tail comparison of ucstrncmp Add a version of ucstrncmp with SSE2 with aligning. Add an SSE2-optimised version of ucstrncmp Add the ucstrncmp benchmarks Update the data generation script to use a non-including .cpp Update comments in QString about alignment performance. ...
| | | * fix build after first webkit self-injection attemptOswald Buddenhagen2010-08-231-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it didn't work for several reasons: - if the configures don't add webkit to QT_CONFIG, src.pro doesn't even know that it needs to build WebKit at all, so WebKit would never inject itself into the build. hen-and-egg problem. - the in-Qt build doesn't use WebKit.pro in the first place, so a proper recursive qmake would never create qt_webkit_version.pri. it worked under unix because configure collects all project files irrespective of the actual SUBDIRS structure. - a proper recursive qmake will cache the qt config, so the injection wouldn't be effective during the first qmake run so instead let the configures copy the pri file.
| | | * let WebKit inject itself into the qt configurationOswald Buddenhagen2010-08-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i.e., don't explicitly deal with qt_webkit_version.pri outside of the webkit source directory. Task-number: QTBUG-12379 Reviewed-by: Simon Hausmann
| | | * Make lupdate's QtScript frontend recognize qsTrId() / QT_TRID_NOOP()Kent Hansen2010-08-232-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extracting the translation data is only the first step; a separate commit will make the functions available in the QtScript runtime. Task-number: QTBUG-8454 Reviewed-by: Oswald Buddenhagen
| | | * Add support for comments and meta-data in the lupdate QtScript frontendKent Hansen2010-08-232-22/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings the support more in line with the C++ frontend. No support for magic TRANSLATOR comment yet. Add a proper test for the QtScript parser. Support for qtTrId() and friends coming in a separate commit. Previously the lexer just skipped comments. Now the contents of each comment is retained and passed to a "comment processor" interface. The parser implements the interface and performs logic very similar to the C++ parser to extract data from the comment. Task-number: QTBUG-11774 Reviewed-by: Oswald Buddenhagen
| | | * Streamline lupdate's QtScript frontend's error messagingKent Hansen2010-08-232-44/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like the C++ parser, use a yyMsg() function. Make the lexer a member of the parser, so yyMsg() can access the filename and current line number. This refactoring is done in preparation of two changes that introduce quite a few more potential error message calls (comment processing and qtTrId support). Reviewed-by: Oswald Buddenhagen
| | | * Doc: Updating menu linksMorten Engvoldsen2010-08-231-4/+7
| | | |
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-264-18/+17
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt src/opengl/qgl.cpp tools/configure/configureapp.cpp
| * | | fix Norwegian Breakfast Network warnings in configureJoerg Bornemann2010-08-203-17/+16
| | | | | | | | | | | | | | | | Reviewed-by: ossi
| * | | fix shadow build of configure.exeJoerg Bornemann2010-08-201-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: ossi
* | | | Fixed compile error in runonphone.axis2010-08-241-0/+2
| |/ / |/| | | | | | | | RevBy: Trust me
* | | Added an install target to runonphone.axis2010-08-241-1/+2
| |/ |/| | | | | RevBy: Trust me
* | Doc: changing template menus to better reflect links from the index page.Morten Engvoldsen2010-08-221-3/+5
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-2024-66/+99
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qmake vcxproj generator: fix usage of /Fd in QMAKE_CXXFLAGS qmake: fix vcxproj generator when using /Fd in QMAKE_CXXFLAGS Revised fix for pixmap loading Assistant: Clean-up - fix spelling mistakes. Assistant: Clean-up: Use const references in foreach loops. Assistant: Clean-up: Mark constructors as explicit. Assistant: Clean-up - add newlines to end of files. Doc: Changes to the index page and second level pages linking to the index page. Use Ctrl rather than Alt for switching tabs in the demo browser Doc: fixing creator bugs, removing menus and textbox in the header Update Japanese translations Ukrainian translation updated qtconfig and qvfb internationalization fixes add full width characters to ending() in linguist QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filter qdoc: Changed id attribute to be a UUID. just build connman and networkmanager plugins on linux
| * | Assistant: Clean-up - fix spelling mistakes.Christian Kandeler2010-08-201-1/+1
| | |
| * | Assistant: Clean-up: Use const references in foreach loops.Christian Kandeler2010-08-202-3/+3
| | |
| * | Assistant: Clean-up: Mark constructors as explicit.Christian Kandeler2010-08-2013-16/+19
| | |
| * | Assistant: Clean-up - add newlines to end of files.Christian Kandeler2010-08-202-2/+2
| | |
| * | Doc: Changes to the index page and second level pages linking to the index page.Morten Engvoldsen2010-08-201-1/+1
| | |
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-206-37/+66
| |\ \
| | * | qtconfig and qvfb internationalization fixesTasuku Suzuki2010-08-204-32/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - install QTranslators in qtconfig and qvfb - add tr() to qvfb strings Merge-request: 783 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | add full width characters to ending() in linguistTasuku Suzuki2010-08-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U+FF01 (FULLWIDTH EXCLAMATION MARK), U+FF1F (FULLWIDTH QUESTION MARK) and U+FF1A (FULLWIDTH COLON) Merge-request: 2455 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | qdoc: Changed id attribute to be a UUID.Martin Smith2010-08-201-5/+4
| | | | | | | | | | | | | | | | Task-nr: QTBUG-11113
| * | | Doc: fixing creator bugs, removing menus and textbox in the headerMorten Engvoldsen2010-08-201-6/+7
| |/ /
* | | Add a menu option to open remote files in the QML viewerAlan Alpert2010-08-202-0/+15
|/ / | | | | | | Task-number: QTBUG-11019
* | qdoc: Added more elements to qt.pageindexMartin Smith2010-08-191-0/+29
| | | | | | | | Task-nr: QTBUG-11113
* | qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-191-3/+3
| | | | | | | | Task-nr: QTBUG-11113
* | qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-191-0/+6
| | | | | | | | Task-nr: QTBUG-11113
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-181-1/+1
|\ \
| * | make error messages consistentOswald Buddenhagen2010-08-171-1/+1
| | | | | | | | | | | | | | | this re-uses an existing string and obsoletes another one, so it is ok during string freeze.
* | | qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-182-35/+95
|/ / | | | | | | ...and a set of functional group pages.
* | qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-163-0/+21
| | | | | | | | ...and a set of functional group pages.
* | qdoc: Added the fix to change qml-qml-file.name to qml-file.nameMartin Smith2010-08-131-3/+3
| |
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-124-43/+185
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-129-25/+125
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported update Russian translations for Qt and tools Updated Slovenian translations for Qt 4.7 doc: The QML Qt element was missing from the documentation. 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256 QXmlStreamReader: avoid unnecessary detaching QSslCertificate: support expiration dates > 2049 Doc: Fixing typo Doc: Fixing bug involving header misplacement in Creator style qdoc: Added list of all members (including inherited) page to QML elements. qdoc: Ensured that text is encoded correctly. qdoc: Fixed non-well-formed markup. Doc: Fixed typo in a shortcut string. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Doc: Added more license information.