summaryrefslogtreecommitdiffstats
path: root/bin
Commit message (Collapse)AuthorAgeFilesLines
* 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-101-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-106-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
* | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-2/+25
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * Added support for unsigned smart installer package creation in SymbianMiikka Heikkinen2010-09-301-2/+25
| | | | | | | | | | | | | | | | | | Make target "unsigned_installer_sis" can now be used to create unsigned smart installer sis. The contained application sis will also be unsigned. Task-number: QTBUG-13902 Reviewed-by: axis
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-282-17/+33
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| * Disallow patching capabilities of executablesMiikka Heikkinen2010-09-232-17/+33
| | | | | | | | | | | | | | | | | | | | | | | | All of the assigned capabilities of executables are likely to be actually needed unlike those of dlls, so do not create a patched sis for an application with non-self-signable capabilities. Similarly block creation of a patched package if any executable has a protected range SID, as installer will refuse to install such a package anyway. Task-number: QTBUG-13886 Reviewed-by: Janne Koskinen
* | Add support for ARMv7 atomic operationsBradley T. Hughes2010-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ARMv7 adds the DMB (data memory barrier) instruction which we can use to enforce memory barriers in QAtomicInt and QAtomicPointer. Other than that, ARMv7 is identical to ARMv6. Adjust the ARMv6 code to relax the compiler memory barriers on the *Relaxed() operations, and use *Relaxed() functions together the appropriate compiler barriers in the *Acquire(), *Release(), and *Ordered() functions. For "pure" ARMv6 code, the barriers are only compiler barriers, but for ARMv7, we also emit the DMB instruction. Reviewed-by: thiago
* | Merge the armv6 and arm architecturesBradley T. Hughes2010-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having multiple architectures, merge them and select the appropriate implementation based on what the compiler actually supports. The original qatomic_arm.h header has been renamed to qatomic_armv5.h, and qatomic_arm.h now does nothing more than including either qatomic_armv6.h or qatomic_armv5.h Since this changes the build-key for targets that previously used armv6, we need a 3rd compatibility build-key for the architecture. The configure script will always write out this build-key when building for arm (and silently converts -arch armv6 to -arch arm). Reviewed-by: thiago
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-221-19/+64
|\ \ | |/ | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache_p.h src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
| * Improved output of patch_capabilities.pl scriptMiikka Heikkinen2010-09-211-19/+64
| | | | | | | | | | | | | | | | | | More detailed output of what was patched reduces user confusion. Properly prefixed output messages can also be easily parsed by IDEs like Qt Creator. Task-number: QTBUG-13760 Reviewed-by: Janne Koskinen
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-212-4/+12
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * Fixed EPOCROOT references in createpackage.pl.axis2010-09-161-5/+8
| | | | | | | | | | | | | | The makefile build system does not require EPOCROOT to end in a slash. RevBy: Jani Hautakangas
| * Fix compile error with active perl 5.8.9Shane Kearns2010-09-141-2/+3
| | | | | | | | Reviewed-by: Jani Hautakangas
| * This patch enables calling createpackage script alsoJani Hautakangas2010-09-141-2/+5
| | | | | | | | | | | | when using EPOCROOT that contains drive letter. Reviewed-by: axis
generated by cgit v0.12 at 2024-12-26 15:36:56 (GMT)