summaryrefslogtreecommitdiffstats
path: root/mkspecs/common/linux.conf
Commit message (Collapse)AuthorAgeFilesLines
* purge QMAKE_LIBS_OPENGL_QTOswald Buddenhagen2013-02-131-1/+0
| | | | | | | | | | it differed from QMAKE_LIBS_OPENGL only for the irix/sco/unixware -cc specs for not entirely obvious reasons. as all these specs are obsolete, remove it. Change-Id: I7d50ffa11ff830371ea52c9ebe25e1f1bc56b307 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* adjust specs to the new target mode handlingOswald Buddenhagen2012-09-081-0/+2
| | | | | | | | | | | | not strictly necessary, but nicer. QMAKE_PLATFORM (and thus CONFIG) now also contains the name of the OS, and its family (if applicable, e.g., bsd). this also adds more feature search paths. Change-Id: I3ab971e6e3b2b32cae53b95e4bc67a86688bc5cb Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* centralize definitions of shell commandsOswald Buddenhagen2012-06-191-11/+0
| | | | | | | there are only two types. everything else is duplication. Change-Id: I87f2bdd3d56b94bb2ecdb60e8861afeb9af3666f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* purge QMAKE_INCDIR_QT and QMAKE_LIBDIR_QTOswald Buddenhagen2012-06-191-2/+0
| | | | | | | they are equivalent to QT_INSTALL_(HEADERS|LIBS)/get. Change-Id: Ic4b47f3ca7db55785b96f19020a2fa020a8d25bd Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove all references to X11 session managementDonald Carr2012-06-011-1/+0
| | | | | | | | | There is no session management currently implemented for the xcb QPA backend. Update the build system to reflect this. Change-Id: I3486de5741f1fb7e09330ca142b8235a84d3b91d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Change default value of QMAKE_LIBS_OPENGL_ES1 to libGLESv1_CMJason Barron2012-04-111-1/+1
| | | | | | | | | | | | The naming convention for these libraries says that libGLES_CM is to be used when EGL is included while libGLESv1_CM should be used when EGL is not included. Since we have a seperate variable for libEGL, it makes sense to have this variable represent the non-EGL version of the library. Change-Id: I9147c116da7be4a296a0ebeac39762b46725f10e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix the QMAKE_LIBS_WAYLAND variableJørgen Lind2012-03-121-1/+2
| | | | | | | | | | This variable is there for documentation, but its not being used anymore. There are two libraries from wayland, libwayland-client and libwayland-server. Add two variables that will be picked up in the QtWayland module. Change-Id: I16219092a4ed2e48080921ce39f61192b6abb711 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Query udev build parameters from pkg-configDonald Carr2012-03-071-0/+1
| | | | | | | | Change-Id: Ia3b7329d7359684ee7bf572a7e5fb681105108f4 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Holger Freyther <holger+qt@freyther.de> Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecsOswald Buddenhagen2012-03-011-3/+0
| | | | | | | | there is entirely no point in having it there. Change-Id: Ie2fc1e94495119725131cbd50564648cbb4a7dc8 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Make sure that we pick up xcb from pkg-configJørgen Lind2012-02-201-0/+4
| | | | | | | | and run the configure checks with the values Change-Id: Ie8e0072c686c6a7dce1d02e25a9c1abce4679d34 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't hard-code paths to /usr/X11R6 in linux-mkspecsTor Arne Vestbø2012-02-141-4/+4
| | | | | | | | | It was causing issues when cross-compiling with a sysroot, as the paths were not prefixed with the sysroot. The right include paths should be taken care of by pkgconfig anyways. Change-Id: I2cf7bf6377c88e6bf3b015100444d082530337ec Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add a wayland-scanner rule to qmakeJørgen Lind2011-12-121-0/+1
| | | | | Change-Id: I142ca2ba2a817745b818d2740d9ae8e0eaf3b797 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+67
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12