summaryrefslogtreecommitdiff
path: root/bin
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAkseli Salovaara2015-03-317-93/+93
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* generate QGL header file from qgl.hLiang Qi2014-07-221-0/+2
| | | | | | | Task-number: QTBUG-16838 (backported from qtbase commit 8b8eebd8a41bd91aeb5b55b702a4dbc7a8db5752) Change-Id: I4e79404fc8203c55bdbd09c6ae9c6c7cefa915b7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Updated year in copyright headerKai Koehne2014-03-267-7/+7
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-137-7/+7
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-297-170/+170
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-017-17/+53
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-117-7/+7
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Improve patch_capabilities script output.Miikka Heikkinen2011-10-261-7/+8
| | | | | | | | Now prefix any actual patching errors with "ERROR:" so that they will be obvious also in QtCreator builds. Task-number: QTBUG-22267 Reviewed-by: Sami Merila
* Fix headers generation for QtWebKit.Alexis Menard2011-06-291-2/+19
| | | | | | | | | | syncqt assumes that the pro files of modules are named the same way as the directory they are in. QtWebKit 2.2 has its main pro file called QtWebKit.pro and not qt.pro even if it's located in src/3rdParty/webkit/Source/WebKit/qt. This patch ensure that syncqt will look for a pro file if there is one in the directory in the case there isn't one named the same way as the directory. Reviewed-by:mariusSO
* Make QtWebKit actually works when linked to an application.Alexis Menard2011-06-161-2/+2
| | | | | | | | Make sure that syncqt generates proper headers with proper paths so that headers.pri in $BUILD_DIR/lib/QtWebKit points to the right place. headers.pri in the build dir is used by qbase.pri to setup MacOS frameworks for example. Reviewed-By: Andreas Kling
* Updated WebKit to d14495f006a09eaee01d155fa57c80537408a835Alexis Menard2011-05-301-1/+1
| | | | Reviewed-by: Andreas Kling
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-136-104/+104
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-04-282-12/+74
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-211-1/+3
| |\ | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_ost/qostdevice.h
| | * fix unititialized value use when timestamping qconfig.hDarryl L. Miles2011-04-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | we may be creating the forwarding header for a not yet existing file, so the timestamp may be undefined. Task-number: QTBUG-15330 Merge-request: 1174 Reviewed-by: ossi
| | * Fix the license info for bin/elf2e32_qtwrapper.pl.Liang Qi2011-03-151-0/+40
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Fixed a bug in elf2e32_qtwrapper regarding spaces in def files.axis2011-03-041-3/+3
| | | | | | | | | | | | | | | | | | | | | It would not parse the line correctly if a space was missing between the "@" and the ordinal number. RevBy: Trust me
| | * Fixed elf2e32_qtwrapper when not using def files.axis2011-02-211-13/+17
| | | | | | | | | | | | | | | RevBy: Liang Qi Task: QTBUG-14952
| | * Fixed a bug in the elf2e32_qtwrapper script.axis2011-02-211-14/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It did not handle missing symbols in all cases, most notably when elf2e32 decides to omit it from the produced def file. This required us to start reading the original def file as well, to find out what the original symbols was. Task: QTBUG-11839 RevBy: Thomas Zander
| | * Added wrapper for the elf2e32_qtwrapper script.axis2011-02-213-145/+151
| | | | | | | | | | | | | | | | | | This is needed to call the script on Windows. RevBy: Trust me
| * | Added a consistency check for number of missing symbols in elf2e32.axis2011-04-071-4/+35
| | | | | | | | | | | | Reviewed-by: Trust me
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-072-31/+60
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/corelib/thread/qthread_unix.cpp
| * | | Added debugging output to elf2e32_qtwrapper.axis2011-04-041-0/+31
| | | | | | | | | | | | | | | | Reviewed-by: Trust me
| * | | Fixed detection of internal errors in the elf2e32_qtwrapper script.axis2011-04-041-6/+4
| | | | | | | | | | | | | | | | Reviewed-by: Trust me
| * | | Added some more error handling to the elf2e32_qtwrapper.axis2011-04-011-4/+4
| | | | | | | | | | | | | | | | RevBy: Liang Qi
* | | | Improve logic to find default certificates in createpackage scriptMiikka Heikkinen2011-04-131-4/+10
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original implementation assumed createpackage script was always run from under Qt source tree bin directory, which is not always the case as on some platforms the Qt tools can be found from under EPOCROOT. Fixed it so that if the default directory for default certificates can't be found in the expected location, createpackage will attempt to query qmake in the same directory as the createpackage script for the location of the Qt source tree (QT_INSTALL_PREFIX) and look for default certificates directory from under there. Task-number: QTBUG-18684 Reviewed-by: Janne Koskinen
* | | Make createpackage and patch_capabilties scripts use tmp dirMiikka Heikkinen2011-03-222-31/+60
|/ / | | | | | | | | | | | | | | Temporary files created by these two scripts will now be created under a separate directory, contents of which is also added to cleanup. Task-number: QTBUG-11394 Reviewed-by: axis
* | Update copyright year to 2011.Rohan McGovern2011-03-111-1/+1
| | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-176-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-116-6/+6
| | | | | | | | Reviewed-by: Trust Me
* | Fixed a bug in elf2e32_qtwrapper regarding spaces in def files.axis2010-12-231-3/+3
| | | | | | | | | | | | | | It would not parse the line correctly if a space was missing between the "@" and the ordinal number. RevBy: Trust me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-062-116/+142
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/win32/msbuild_objectmodel.cpp src/gui/image/qpnghandler.cpp src/network/access/qnetworkaccessdatabackend.cpp src/opengl/qgl_x11egl.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Unify epocroot usage in createpackage and patch_capabilities scriptsMiikka Heikkinen2010-12-032-12/+19
| | | | | | | | | | | | | | | | Some tools calls required epoc32/tools to be in path and some didn't. Now all tools calls will use tools from under %EPOCROOT%epoc32/tools if EPOCROOT env variable is defined. Reviewed-by: Janne Koskinen
| * Only patch package content that is necessary for self-signingMiikka Heikkinen2010-11-252-105/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic patching was modifying all package files in ways that only made sense for very limited set of projects. Some things were also no longer necessary due other developments, so dropped the dependency, embedded sis, and manufacturer check modifications. Also provided an option to do a self-signed compatibility check for the package instead of patching it automatically by specifying "-d" parameter in QT_SIS_OPTIONS env variable or createpackage command line, depending on how package is made. Task-number: QTBUG-15561 Reviewed-by: axis
* | Fix license headersJason McDonald2010-12-011-0/+40
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-1/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Add Location as self signable capability in patch_capabilities.plMiikka Heikkinen2010-11-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | Location was not originally included in self-signable set, since in S60 3.1 devices it is not so. However, it is a lesser of two evils to make applications with Location capability not install on 3.1 devices than make them not work correctly on any devices, so Location is now included in the self-signable set in patch_capabilities.pl. Task-number: QTBUG-13891 Reviewed-by: Janne Koskinen
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-041-13/+17
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed elf2e32_qtwrapper when not using def files.
| * | Fixed elf2e32_qtwrapper when not using def files.axis2010-11-041-13/+17
| | | | | | | | | | | | | | | RevBy: Liang Qi Task: QTBUG-14952
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-041-6/+8
|\ \ \ | |/ / |/| / | |/
| * exclude headers in builddir from -copy optionOswald Buddenhagen2010-11-031-1/+1
| | | | | | | | Reviewed-by: joerg
| * more elegant treatment of qconfig.h special caseOswald Buddenhagen2010-11-031-5/+7
| | | | | | | | | | | | | | | | instead of injecting it only if it is not there yet, exclude it if it is already there and then unconditionally inject it. this makes things more deterministic. Reviewed-by: joerg
* | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-271-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fix bug in QML debug client installation Doc clarification for Loader. Phonon MMF backend: set _q_DummyWindowSurface property on VideoWidget Create dummy window surface if if _q_DummyWindowSurface property is set Remove widget subtree from backing store tracker when reparented Suppress call to controlVisibilityChanged for null control pointer Set the location of the closing brace. Fix patch_capabilities.pl script for explicit set of capabilities Fix empty mifconv TARGETFILE in some edge cases.
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-271-0/+3
| |\ \ | | |/
| | * Fix patch_capabilities.pl script for explicit set of capabilitiesMiikka Heikkinen2010-10-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Elftran command never got executed when explicit set of capabilities was defined. No warning or error was printed either, making it rather confusing for user. Task-number: QTBUG-14730 Reviewed-by: Janne Koskinen
* | | Fixed a bug in the elf2e32_qtwrapper script.axis2010-10-271-14/+90
|/ / | | | | | | | | | | | | | | | | | | It did not handle missing symbols in all cases, most notably when elf2e32 decides to omit it from the produced def file. This required us to start reading the original def file as well, to find out what the original symbols was. Task: QTBUG-11839 RevBy: Thomas Zander
* | Merge branch 'macMakefileBuildSupport' into master.Liang Qi2010-10-263-145/+151
|\ \
| * | Added wrapper for the elf2e32_qtwrapper script.axis2010-10-213-145/+151
| | | | | | | | | | | | | | | | | | This is needed to call the script on Windows. RevBy: Trust me
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-4/+9
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * | Fix epocroot handling in createpackage.pl scriptMiikka Heikkinen2010-10-151-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | Before this fix, creating stub sis failed if epocroot was simply a forward slash. Mixing forward slashes and backslashes also caused issues. Reviewed-by: Janne Koskinen
View Lorry Controller Status