summaryrefslogtreecommitdiffstats
path: root/qmake/generators/unix
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-133-3/+3
| | | | | | 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-293-72/+72
| | | | | | | | 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-013-6/+6
| | | | | | | | | | | | | - 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-113-3/+3
| | | | | | | | | 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>
* Export IPHONEOS_DEPLOYMENT_TARGET from qmakeIan2011-06-201-0/+4
| | | | Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-133-51/+51
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* qmake: Introduce new template typeChristian Kandeler2011-05-031-1/+5
| | | | | | The template type "aux" is intended for projects that do not require building anything, but may need to install stuff (e.g. applications with QML entry point). Reviewed-by: Joerg Bornemann
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-1/+2
|\ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| * dist target: fixify OBJECTS_DIR against output dirOswald Buddenhagen2011-04-121-1/+2
| | | | | | | | | | | | the thing is terminally broken anyway, but whatever Reviewed-by: mariusSO
* | qmake/Mac: replace @SHORT_VERSION@ in QMAKE_INFO_PLIST file not only for libsJoerg Bornemann2011-03-151-5/+13
| | | | | | | | | | Task-number: QTBUG-7993 Reviewed-by: Marius Storm-Olsen
* | don't add extraneous empty command linesOswald Buddenhagen2011-03-011-1/+1
| | | | | | | | Reviewed-by: mariusSO
* | Add experimental support for armCC on LinuxHarald Fernengel2011-02-111-1/+3
| | | | | | | | Reviewed by our Anttis
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-173-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-103-3/+3
| | | | | | | | Reviewed-by: Trust Me
* | qmake: don't limit pkg-config writing to unix generatorMark Brand2011-01-102-182/+0
| | | | | | | | | | | | | | | | Move pkg-config related methods from unix generator to base class so they can be used by other generators too. Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | qmake: fix double directory separatorMark Brand2011-01-101-2/+7
| | | | | | | | | | Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | qmake: Add support for Clang-style precompiled headersTor Arne Vestbø2010-10-182-17/+56
|/ | | | | | | | | | | | | | | | | | The config option clang_pch_style will ensure that QMAKE_PCH_OUTPUT_BASE will not have QMAKE_PCH_OUTPUT_EXT appended, but instead the final output file QMAKE_PCH_OUTPUT will have the QMAKE_PCH_OUTPUT_EXT included. Without clang_pch_style: QMAKE_PCH_OUTPUT_BASE = .pch/debug-shared/QtCore.gch QMAKE_PCH_OUTPUT = .pch/debug-shared/QtCore.gch/c++ With clang_pch_style: QMAKE_PCH_OUTPUT_BASE = .pch/debug-shared/QtCore QMAKE_PCH_OUTPUT = .pch/debug-shared/QtCore/c++.gch Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* qmake: Include -pthread when reducing duplicate library argumentsTor Arne Vestbø2010-10-051-1/+1
| | | | Reviwed-by: Simon Hausmann <simon.hausmann@nokia.com>
* qmake: Ensure right library order when reducing duplicate librariesTor Arne Vestbø2010-10-051-4/+6
| | | | | | | | | | | | | | | | Commit 3ed9e2788e8 changed the logic from using lookahead to checking if the library already existed in the arguments parsed so far. This broke the case -lFoo -lBar -lFoo where Bar depends on symbols in Foo. Since we were reducing this to -lFoo -lBar, the linker would not know which missing symbols to include from Foo when encountering the -lFoo argument. We now keep the library order when building the final argument list, by making sure the position of a duplicated library is always that of the last instance of that library. Task-number: QTBUG-13944 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* qmake: Make smart library merge architecture-awareTor Arne Vestbø2010-09-201-14/+37
| | | | | | | | | | | | Qmake's smart library merge would not take Xarch into account, so lines like -Xarch_i386 -foo -Xarch_ppc -foo would be reduced to -Xarch_i386 -Xarch_ppc -foo, due to the "duplicate" -foo. The explicit addition of the -Xarch option for each entry of the architecture specific options is intentional, to make cases like "-Xarch_i386 -framework Foo" magically work. Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/Oswald Buddenhagen2010-04-301-1/+1
| | | | Reviewed-by: joerg
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-112-4/+2
|\ | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| * don't have every generator duplicate the QMAKE_QMAKE logicOswald Buddenhagen2010-03-032-4/+2
| | | | | | | | Reviewed-by: mariusSO
* | Enabled dependencies for .dso and .lib libraries only.axis2010-03-091-1/+3
| | | | | | | | | | | | This adds support for .lib files, as well as removes support for all others than .dso and .lib. This builds on the original commit bdff51768dfe.
* | Merge branch 'defFilesAndMisc'axis2010-03-081-0/+4
|\ \ | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian-makefile.conf mkspecs/symbian/features/symbian_building.prf
| * | Added dso dependencies to Symbian targets.axis2010-03-021-0/+4
| | | | | | | | | | | | | | | | | | | | | This is required for correct intermodule building when def files are off, since otherwise the ordinals present in the DLLs and the ordinals linked to may be different. In layman's terms: If you build QtCore, QtGui will also trigger rebuilding as a result of that.
* | | Make gcce xcompiler for symbian compile+link QtCoreThomas Zander2010-02-241-2/+2
|/ / | | | | | | | | This moves some stuff from the common to linux-armcc specific and updates the cloned gcce specs to do the right thing.
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2010-02-181-4/+2
|\ \ | |/ | | | | | | | | | | | | | | merge-with-qt-master Conflicts: mkspecs/common/symbian/symbian.conf qmake/Makefile.unix qmake/generators/makefile.cpp
| * remove remainder of mac9 modeOswald Buddenhagen2010-02-121-4/+2
| | | | | | | | Reviewed-by: mariusSO
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-161-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/application_icon.prf qmake/generators/makefile.cpp qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake.cpp tools/assistant/tools/assistant/assistant.pro
| * Merge branch '4.6'Thiago Macieira2010-01-133-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-12-051-1/+1
| |\ \
| * | | Prevent cross-talk between different Qt builds on OS X.Morten Sorvig2009-10-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /Library/Frameworks/ is hardcoded as a .prl file lookup path, which sometimes wreaks havoc when depot builds pick up settings and binaries from an installed binary package. Remove /Library/Frameworks from the qmake sources. The binary package build script already adds -F /Library/Frameworks explicitly. /Library/Frameworks is still kept as a default _framework_ search path, since it does not seem to cause trouble, and people may be relying on that path being searched by default.
* | | | Implemented pkg generator for the symbian/linux-armcc mkspec.axis2010-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It reuses almost everything from the original pkg generator, but the code had to be restructured to accomodate for the new makefile generator. In addition a few new codepaths and profile changes had to be introduced to cope with the fact that this mkspec puts files in different places than Symbian does (inside $QTDIR/lib instead of $EPOCROOT/...). This enables the pkg generator to generate correct pkg files for Qt itself, but applications will not work yet because they also require generated rss files.
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-213-3/+3
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: mkspecs/features/symbian/platform_paths.prf
| * | | Update copyright year to 2010Jason McDonald2010-01-063-3/+3
| | |/ | |/| | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-12-181-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: configure src/gui/text/qfontdatabase_s60.cpp
| * | Apparently fixes some build issues on some old unixes...Pierre Rossi2009-12-041-1/+1
| |/ | | | | | | Reviewed-by: Marius Storm-Olsen
* | Added support for QT_*_STATICLIB variables in qmake.axis2009-12-111-6/+10
| | | | | | | | This is so that Symbian can have custom prefixes and extensions.
* | Switched to using ABIv2 format to generate Symbian binaries.axis2009-12-111-5/+1
| | | | | | | | | | This means using elf2e32 instead of elftran, and eliminates the need for generating exports manually.
* | Switched Symbian away from the Linux lib$(TARGET).4.6.0 naming schemeaxis2009-10-231-3/+21
| |
* | Added QMAKE_PREFIX_SHLIB and QMAKE_SYMBIAN_SHLIB support.axis2009-10-231-16/+29
|/ | | | | | | | | The first enables you to use a prefix in front of the library. It is by default enabled for all platforms which previously used "lib", and on Symbian it is set to the empty string. The second variable enables Symbian style linking, where you link to a stub .lib file, but the actual runtime library is .dll.
* Update license headers again.Jason McDonald2009-09-093-12/+12
| | | | Reviewed-by: Trust Me
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-313-39/+39
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-313-39/+39
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-113-3/+3
| | | | | | | | Reviewed-by: Trust Me
* | Make the license test pass.Frans Englich2009-08-191-11/+8
| | | | | | | | | | | | | | This is partly done to address a review comment for S60. Reviewed-by: Marius SO Reviewed-by: Paul
* | Add LIBS_PRIVATE to qmake.Thiago Macieira2009-08-172-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | The difference between LIBS and LIBS_PRIVATE is that private libraries are those that are not part of the public interface of a library. For example, if you're writing a Qt application and link to QtGui, you definitely need the development files for QtCore, but not necessarily for Glib and GThread, or maybe even X11. The private libraries are necessary only in static builds, so the information should still be published in .prl and pkg-config files. Reviewed-By: Marius Storm-Olsen
* | Set the QMAKE_BUNDLE_LOCATION to 'Contents/MacOS' only if it's not setTor Arne Vestbø2009-08-141-1/+1
| | | | | | | | | | | | This matches the logic for the 'lib' template to the one for 'app'. Reviewed-by: Simon Hausmann
* | Update contact URL in license headers.Jason McDonald2009-08-123-3/+3
| | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-12-28 20:53:20 (GMT)