summaryrefslogtreecommitdiffstats
path: root/bin
Commit message (Collapse)AuthorAgeFilesLines
* Change copyrights from Nokia to Digia.Marko Valtanen2012-11-307-142/+148
|
* Update licenseheader text in source filesJyri Tahtela2011-05-136-104/+104
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* 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
* Update copyright year to 2011.Jason McDonald2011-01-116-6/+6
| | | | Reviewed-by: Trust Me
* 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
* 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
* 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
* 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
* 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
* 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
* 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
* 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
* 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
* Added meego graphics system helper to features/qt.prf and syncqt.Samuel Rødal2010-09-101-0/+1
| | | | | | MeeGo graphics system helper headers are now synced and the correct include path and libraries are added to an application by doing QT += meegographicssystem helper in the .pro file.
* make syncqt propagate timestamps as wellOswald Buddenhagen2010-09-011-5/+10
| | | | | | | | this should reduce the number of unnecessary rebuilds of qt-using code even after re-building qt from scratch - provided the timestamp of qconfig.h is preserved externally. Task-number: QTBUG-12731
* remove overquotingOswald Buddenhagen2010-09-011-80/+80
| | | | | | in perl, "$foo" is basically just slower and less legible than $foo. Reviewed-by: joerg
* put iterator variables into loop headersOswald Buddenhagen2010-09-011-38/+19
| | | | Reviewed-by: joerg
* Fix gcce building of apps using static libraries in symbian-sbsv2Miikka Heikkinen2010-08-312-2/+24
| | | | | | | | | Removed usage of buggy .release_gcce target from symbian-sbsv2 generated makefiles. Now gcce builds like armv5 as it is supposed to when using Raptor. Task-number: QTBUG-13307 Reviewed-by: axis
* Fix #pragma message(), the message must be enclosed in parenthesesminiak2010-08-301-1/+1
| | | | | Merge-request: 796 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixed incorrect include/Qt/qconfig.h in binary packages.Rohan McGovern2010-08-051-1/+4
| | | | | | | | | | | | When building from a source package, src/corelib/global/qconfig.h exists. syncqt contained logic to force the creation of include/Qt/qconfig.h for the case where it _doesn't_ exist. This meant that running syncqt from a Qt source package resulted in include/Qt/qconfig.h including qconfig.h twice. Task: QTBUG-12637 Reviewed-by: Toby Tomkins
* fix epic fail from 4ba6646Oswald Buddenhagen2010-07-291-5/+3
| | | | Reviewed-by: joerg
* Fixed package creation when shadow building.axis2010-07-261-1/+2
| | | | RevBy: Markus Goetz
* Merge remote branch 'origin/4.7' into 4.7-from-4.6Rohan McGovern2010-07-181-1/+5
|\ | | | | | | | | Conflicts: tests/auto/qtexttable/tst_qtexttable.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-151-1/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (96 commits) Unbreak the Maemo 5 build after the Symbian fix QNAM HTTP: Fix problem with cached files and metaDataChanged() Add a testcase for QTBUG-11213 to prevent future regressions. Autotest: reenable the NTLM proxy test on tst_QTcpSocket Autotest: add a small, boring test for QAuthenticator Add documentation for the QAuthenticator options. Expose the QAuthenticator map of options in the API. Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeader Revert BIC change "Build Qt with option -Zc:wchar_t under MSVC" Fix for tst_qmdisubwindow::fixedMinMaxSize failure on Cocoa Add unit tests for QMimeData. fix qconfig.h reference for shadow builds Drag and drop cursor doesnot change on invalid drop areas (Cocoa) Crash while runnig tst_QMdiSubWindow::emittingOfSignals test on Cocoa fix qconfig.h aliased header creation fix warning directive on gnuc qdoc: Removed navigation arrow that was causing display problems. Silence warning when building with MSVC 2005 Fix an Assert in QTextTable Revert "Fix an Assert in QTextTable" ...
| | * fix qconfig.h reference for shadow buildsOswald Buddenhagen2010-07-141-1/+3
| | | | | | | | | | | | Reviewed-by: joerg
| | * fix qconfig.h aliased header creationOswald Buddenhagen2010-07-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | don't have configure create the forwarding headers (or symlinks on unix) for qconfig.h, but instead have syncqt create forwarding headers for not yet existing files. Reviewed-by: joerg
| | * fix warning directive on gnucOswald Buddenhagen2010-07-141-1/+1
| | |
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-07-151-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.h src/3rdparty/webkit/WebCore/page/FrameView.cpp src/3rdparty/webkit/WebCore/page/FrameView.h src/3rdparty/webkit/WebCore/platform/ScrollView.cpp src/3rdparty/webkit/WebCore/platform/ScrollView.h src/corelib/plugin/quuid.cpp src/gui/dialogs/qfontdialog.cpp src/multimedia/audio/qaudiodevicefactory.cpp src/opengl/qgl.cpp src/openvg/qpaintengine_vg.cpp tests/auto/qxmlquery/tst_qxmlquery.cpp
| * | syncqt: don't try to split %module's valuesJoerg Bornemann2010-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Using semiconlon separated directory lists in module values is broken and unused. Removing this feature. Task-number: QTBUG-4586 Reviewed-by: ossi
| * | syncqt: fix wrong paths in include/ActiveQt/headers.priJoerg Bornemann2010-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning a semicolon separated list of directories to a Qt module does not work correctly. The values of %modules must be split into single values before operating on them. This doesn't happen in all places. ActiveQt is the only module where this feature is used. Also, it is not needed anymore for this particular module. Thus, I'll just remove the semicolon separated list from ActiveQt and replace it with the module directory. Task-number: QTBUG-4586 Reviewed-by: ossi
| * | Revert changes to syncqt.Joerg Bornemann2010-06-071-392/+370
| | | | | | | | | | | | | | | | | | This reverts commit 24e198c15a807d4829d0f25d9169b8e188d57321. This reverts commit afdda55661ddf4e054624567e6d7ef2481d3998c. This wasn't meant for 4.6.
| * | deprecate header files in $$QT_BUILD_TREE/include/QtJoerg Bornemann2010-06-041-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To resolve the header file conflict as described in QTBUG-10647, we * remove include/Qt/private * "syncqt -copy" creates in include/Qt local forwarding headers instead of header file copies In case of a conflict, e.g. qxmlstream.h, we include both header files. All header files in include/Qt now yield a preprocessor warning, if they're included. They should not be used and will vanish some day. Task-number: QTBUG-10647 Reviewed-by: ossi
| * | syncqt: tabs changes to spacesJoerg Bornemann2010-06-041-369/+369
| | |
* | | Allow commenting of individual files in generated pkg files.axis2010-07-151-1/+1
| |/ |/| | | | | RevBy: Jason Barron
* | syncqt: abort on permission error writing to include/QtArvid Picciani2010-06-291-3/+3
| | | | | | | | | | Merge-request: 707 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | Fixed several problems with the postlinker for Symbian (elf2e32).axis2010-06-241-0/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fixes were too complicated for a profile and so a perl script was introduced. These are the issues that were addressed: - Made sure that we link correctly in all cases where there is a mismatch between the DEF file and the ELF file. Specifically, these two cases: - If elf2e32 detects a symbols in the ELF file that is marked as absent in the DEF file, an ordinal mapping will not be generated in the dso file. This means that binaries linking to the library will not find the symbol, even though it exists in the code. Since this is completely useless behavior, this was fixed to include the symbol regardless. - If the DEF file contains a symbol that is not present in the ELF file, an ordinal mapping will be created in the dso file regardless, which means applications can link to a symbol that does not exist. This is even worse than point one, since it is not detected until runtime, when the dynamic link will fail. Fixed by leaving the symbol out of the dso file if it does not exist in the ELF file. Both fixes require rerunning elf2e32 to fix the symbol mappings that were broken in the first run, but it only happens if at least one symbol is broken in the way described above. Also, freezing the DEF files will "save" the symbols, so that it does not occur after that. Note that this does not remove the ability to get the postlinker to tell you about mismatches. By doing "QMAKE_ELF2E32_FLAGS -= --unfrozen", the symbol mismatches will be considered errors instead of warnings, and they can be caught that way. - Code that was previously in the profile was moved to the perl script: - Detecting that there are errors in the postlink and return nonzero. elf2e32 does not do this on its own (at least not when using Wine). - Only overwriting the old dso file if the new one is different. This saves build time, since binaries that depend on the library do not trigger relink if the dso has not changed. These two points simplify the code, and they will also help the porting to Windows, since the old shell script tricks would not have worked there. RevBy: Trust me
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-162-7/+29
|\ \ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Provide 'make unsigned_sis' target for Symbian mkspecs
| * | Provide 'make unsigned_sis' target for Symbian mkspecsMiikka Heikkinen2010-06-162-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rationale for this is that currently there is no simple way to create a sis package that can be properly signed via Symbian open signed mechanism, as 'make sis' will by default use self-signed certificates and automatically patch capabilities of binaries to remove non-self-signable ones. Task-number: QTBUG-11455 Reviewed-by: Janne Koskinen
* | | deprecate header files in $$QT_BUILD_TREE/include/QtJoerg Bornemann2010-06-081-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To resolve the header file conflict as described in QTBUG-10647, we * remove include/Qt/private * "syncqt -copy" creates in include/Qt local forwarding headers instead of header file copies In case of a conflict, e.g. qxmlstream.h, we include both header files. All header files in include/Qt now yield a preprocessor warning, if they're included. They should not be used and will vanish some day. Task-number: QTBUG-10647 Reviewed-by: ossi
* | | syncqt: change tabs to spacesJoerg Bornemann2010-06-081-376/+376
|/ / | | | | | | This file originally used tabwidth of 8.
* | Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-191-2/+1
|\ \ | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_s60.cpp