summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c ↵Morten Engvoldsen2010-09-071-1/+1
| | | | changing qml elements page
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-09-076-19/+74
|\
| * Pause orientation sensors in Qml Viewer when the application window is not ↵Joona Petrell2010-09-075-17/+73
| | | | | | | | | | | | | | active Task-number: QTBUG-13347 Reviewed-by: Martin Jones
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-064-4/+21
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (33 commits) make shadow builds not write into the source dir Fix failing tst_qmdisubwindow test after 71a3b1a0d3 Doc: update the documentation of QUrl about HTML Form encoding search translator comments Install translators earlier in assistant Fix compilation on ARM: don't include kernel headers Fix compilation of qmake with MSVC Doc: Updating known-issues page. Recognize @, #, $ and ` as word separators rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments ...
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-061-2/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix AnchorAnimation for multiple AnchorChanges with dependancies. Fix recording of QML visual tests when using a QGLWidget viewport. Fix PathView item position on insertion and removal. Small cleanup Ensure WebView gets focus when an editable node is clicked on. Ensure slider is updated when screen size changes. Do not reset sourceSize when changing image source url. Ensure all image state is updated before emitting changed signals.
| | * | Fix recording of QML visual tests when using a QGLWidget viewport.Michael Brasser2010-09-061-2/+1
| | | | | | | | | | | | | | | | | | | | In order for the event filter to work, we need to set the QGLWidget as the viewport before constructing the QDeclarativeTester.
* | | | Doc: updating the qdocconf files and the stylesheetMorten Engvoldsen2010-09-0712-99/+116
| |_|/ |/| | | | | | | | | | | QDocconf files was out of date in the section including extra files Style now shows numbered lists corectly
* | | search translator commentsOswald Buddenhagen2010-09-061-0/+2
| | | | | | | | | | | | Task-number: QTBUG-4165
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-063-4/+19
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits) Install translators earlier in assistant Fix compilation on ARM: don't include kernel headers Fix compilation of qmake with MSVC Doc: Updating known-issues page. Recognize @, #, $ and ` as word separators rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments Ensure that OpenGL contexts are attached to an NSView before first paint Doc: Updating the 3rd party lib used in Qt - including JQuery Doc: Changed the default URL to avoid a Flash plugin crash on x86-64. Reduce memory consumption of QtScript/JSC on Symbian ...
| * | Install translators earlier in assistantVictor Ostashevsky2010-09-061-2/+1
| | | | | | | | | | | | | | | | | | | | | Help message and command line parsing errors will be shown translated Merge-request: 2466 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | Symbian: Disable IPv6 for nowMarkus Goetz2010-09-031-0/+4
| | | | | | | | | | | | | | | | | | OpenC does not fully support IPv6, therefore we cannot either. Reviewed-by: ogoffart
| * | Doc: Fixing links on index page and corecting HTML in the template.Morten Engvoldsen2010-09-031-1/+1
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-021-1/+13
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Updated Supported Platforms page. Finished New binary of configure.exe with -mp/-no-mp option Turn Makefile.win32 into batch-mode, enable /MP and PCH Add option to enable -MP compile option for MSVC Rewrite ucstrcmp in terms of ucstrncmp Reorganise qelapsedtimer_unix.cpp for better inlining performance. Update the cpuid code to be better Revert "Restore default if to system default on session close."
| | * Add option to enable -MP compile option for MSVCMarius Storm-Olsen2010-09-021-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option is on when building Qt, but off by default for other projects, due to potential incompatible compile options in other projects. (/E, /EP, /Gm, /Yc, /showIncludes, #import preprocessor directive) Reviewed-by: bhughes Reviewed-by: ossi
* | | Designer: Fix action editor scrolling.Friedemann Kleint2010-09-061-2/+4
|/ / | | | | | | | | | | | | | | | | In overwritten virtual QAbstractItemView::currentChanged, invoke base implementation. Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Task-number: QTCREATORBUG-2249
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-011-1/+158
|\ \ | |/ |/| | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: The declarative parser should only save comment text (and not /*,*/,//) Support for qsTrId and meta-data in comments for QML. Flickable ensure internal pressed state is cleared when mouse is released. Fix examples autotest Support JS "in" operator on QML objects Only emit change signal when variant properties actually change Use QApplication in QDeclarativeEngine example.
| * The declarative parser should only save comment text (and not /*,*/,//)Michael Brasser2010-09-011-3/+1
| | | | | | | | Reviewed-by: Roberto Raggi
| * Support for qsTrId and meta-data in comments for QML.Michael Brasser2010-09-011-1/+160
| |
* | QString usage cleanupsOswald Buddenhagen2010-09-013-17/+17
| | | | | | | | | | - tr() already returns a QString, duh - use multi-arg arg() (heh)
* | Wrap translatable messages with tr() in assistant, designer and linguistVictor Ostashevsky2010-09-0128-219/+269
| | | | | | | | | | Merge-request: 2456 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Enable loading/generating translations by assistant and linguist toolsVictor Ostashevsky2010-09-016-6/+80
|/ | | | | | | | | | QTranslator is installed in tools (qcollectiongenerator, qhelpconverter, qhelpgenerator, lconvert, lrelease, lupdate). Build targets that updates .ts files are changed to include strings from this tools. Merge-request: 2456 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove unused source files in designerVictor Ostashevsky2010-08-313-170/+1
| | | | | Merge-request: 2463 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix windows build with -prefixOswald Buddenhagen2010-08-311-3/+5
| | | | | | | | | | | passing just a spec name to qmake is bogus, as it will try to find it in the install dir, which of course won't work before it is installed. so either pass nothing at all (when preparing the libraries, as .qmake.cache already contains the right path), or explicitly pass a full path (when building the host tools, as we have to override the spec here). Reviewed-by: mariusSO
* Center and clip QML startup animation so it looks correct in fullscreenAaron Kennedy2010-08-311-41/+47
| | | | QTBUG-12831
* 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