summaryrefslogtreecommitdiffstats
path: root/config.tests/unix/compile.test
Commit message (Collapse)AuthorAgeFilesLines
* Let qmake do most of the work of configuring QtLars Knoll2016-06-221-109/+0
| | | | | | | | | | | | | | | | Command line arguments, configure tests and features are now defined in a json file and a configure.pri containing some custom functions. qmake uses the json file to determine command line arguments, tests and features to be executed at configuration time. A new qt_configure.prf contains all the infrastructure to parse the command line, run the configure tests, determine the set of available features and create a report about it. Change-Id: If30ac089dd3e9f8c67ebd642bde10cfa960893bb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-5/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp src/network/access/qnetworkaccessmanager.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h src/widgets/widgets/qlineedit_p.cpp src/widgets/widgets/qlineedit_p.h src/winmain/winmain.pro tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp tools/configure/configureapp.cpp Change-Id: Ib9997b0d0f91946e4081d36c0c6b696c5c983b2a
| * configure: present some progress status for the detectionsThiago Macieira2016-05-121-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | The "checking for xxx... [yes|no]" is chosen so that it matches exactly what GNU Autoconf does. That way, any tools that parse the output will have less trouble. This feature is useful for us when debugging a build, as not all checks produce output in the configure summary. Change-Id: Id75834dab9ed466e94c7ffff14456edb646a1ced Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-251-1/+18
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/compile.test configure src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java src/corelib/global/qglobal.cpp src/widgets/kernel/qapplication.cpp src/widgets/styles/qwindowsvistastyle.cpp tests/auto/corelib/kernel/qobject/tst_qobject.cpp Change-Id: I067083f34e5290aa5f7565e40c30a069cc37b83a
| * compile.text: Split huge line into multipleThiago Macieira2016-04-191-1/+16
| | | | | | | | | | | | | | Makes it easier to add stuff to it. Change-Id: Id75834dab9ed466e94c7ffff1445727a2ed975cc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-131-1/+6
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/compile.test src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/testlib/qtestcase.cpp src/testlib/qtestcase.qdoc Change-Id: Ied3c471dbc9a076c8de33d673bd557e88575609d
| * Make CFLAGS/CXXFLAGS behave consistently in config.testsDonald Carr2016-04-081-1/+6
| | | | | | | | | | | | | | | | | | The journald test was failing as sysroot was not being passed to the compiler in the compile test. This is due to the fact we were explicitly defining sysroot in the CXXFLAGS and not in CFLAGS. Change-Id: I4b4bda71f9aabc8e420e0e89ff3cc8fa3bbca201 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-021-1/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: config.tests/unix/compile.test src/plugins/platforms/cocoa/qcocoahelpers.mm src/tools/qlalr/cppgenerator.cpp Change-Id: I0103ca076a9aca7118b2fd99f0fdaf81055998c3
| * Fix library inclusion order when building staticallyAlexey Brodkin2016-01-181-1/+1
| | | | | | | | | | | | | | | | | | When building application statically, it's important to keep libraries we're linking against in order. qmake's "*=" operator fails to do that, so use "+=" instead. Change-Id: Id3627da47d07c70fd07185a777f2f07bb4057f03 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | configure: Separate host and build platform.David Schulz2015-10-301-2/+4
| | | | | | | | | | | | | | | | | | | | This separation makes it possible to make a canadian cross build of Qt on a linux build machine. The canadian cross build requires an external Qt that runs on the build system. Change-Id: Ifd83a4c6376d3299647e74bb349a3452a6f433fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | configure: append any unknown compileTest arguments to the qmake command-lineThiago Macieira2015-09-251-2/+5
|/ | | | | | | This allows setting of variables, like FOO=bar. Change-Id: Ib306f8f647014b399b87ffff13f1d9e6a10fa2f8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* support spaces in build and install dirsOswald Buddenhagen2015-02-171-5/+5
| | | | | | | | spaces in the source dir are not supported for now, as that requires some more profound refactoring of the bootstrap makefiles. Change-Id: Ie0c07a1558b8326f642f2ea144bc1cd85ee761af Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* nuke pointless QT_BUILD_TREE assignmentsOswald Buddenhagen2015-02-041-1/+1
| | | | | | | this variable has been dead for the most part for some years. Change-Id: I834e23c5db4585cacfa7fa556509dabc030e5c37 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* check qmake/make exit code instead of looking for an executableOswald Buddenhagen2014-04-141-6/+2
| | | | | | | | | | | | | it's a bit braindead to look whether we managed to build an executable if we can simply use the exit codes of qmake and make to test for success. the windows equivalent is already doing that. this also allows us to do tests that can fail despite building an executable, or not build one in the first place. Change-Id: Ib69f9d005309d55a790dd3d89db1ee913e45b26b Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Disable app_bundle and lib_bundle when running configure testsTor Arne Vestbø2013-07-161-1/+1
| | | | | | | Just like configure.prf. Change-Id: I760e0ca5bec41b3befb738a8a7a468e8f1a15946 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Introducing the Qt Android portPaul Olav Tvete2013-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | Based on the Necessitas project by Bogdan Vatra. Contributors to the Qt5 project: BogDan Vatra <bogdan@kde.org> Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> hjk <hjk121@nokiamail.com> Oswald Buddenhagen <oswald.buddenhagen@digia.com> Paul Olav Tvete <paul.tvete@digia.com> Robin Burchell <robin+qt@viroteck.net> Samuel Rødal <samuel.rodal@digia.com> Yoann Lopes <yoann.lopes@digia.com> The full history of the Qt5 port can be found in refs/old-heads/android, SHA-1 249ca9ca2c7d876b91b31df9434dde47f9065d0d Change-Id: Iff1a7b2dbb707c986f2639e65e39ed8f22430120 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Relax unix compile.test to check the expected file existsRay Donnelly2013-02-201-1/+1
| | | | | | | | | | When cross compiling between two systems that use different program file formats (such as PECOFF vs ELF) -x cannot be relied upon, so -f should be used instead. Change-Id: I4c80646b2b1fbdd6072589d4d9e852adda83424a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Clean up how we build against SDKs on Mac OSTor Arne Vestbø2013-02-191-5/+0
| | | | | | | | | | | | | | | Instead of setting -isysroot in both arch.test, compile.test, the various mkspecs, and sdk.prf, we now propgate the chosen SDK as the qmake variable QMAKE_MAC_SDK, which is then handled exclusivly in sdk.prf. The QMAKE_MAC_SDK variable, and -sdk argument to configure, is expected to be of the short-form name, eg macosx or iphoneos, not a full path, as that's what Xcode also expects. We take care of translating that into a full path for -isysroot/-syslibroot in sdk.prf, using xcodebuild as a helper. Change-Id: I281655b2fa5180c6e78ffdce36824e4a91447570 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* in non-verbose mode, suppress qmake output as wellOswald Buddenhagen2012-09-101-2/+3
| | | | | | | | | | otherwise missing pkg-config requirements, etc. will be visible. Change-Id: I5a5c0f35cf75e1fcc09ddbc7fcc54cef6bfec8b5 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* introduce compileTest functionOswald Buddenhagen2012-08-141-0/+4
| | | | | | | | | | | this cuts down the enormous duplication of identical command line args passed to compile.test. this necessitates the addition of a -config parameter to compile.test, as QMAKE_CONFIG needs to be extended in some cases. Change-Id: I677b2fea4a407b9e4395e70a25e4e349efb0a946 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* device: Add -device and -device-option to configureGirish Ramakrishnan2012-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | For some reference platforms and SDKs we will need to pass in extra paths. Currently users have to modify the mkspec to adjust paths or set environment variables that will be picked up. This change introduces the -device <name> and -device-option <key=value> option. The key value pairs will be written to a qdevice.pri and can be used by the qmake.conf of the device spec. The reason to not save the key value pairs in qconfig.pri is becase of the fact that the device spec loads the qdevice.pri earlier than the qconfig.pri. qdevice.pri allows the mkspec to set the compiler flags and qconfig.pri allows configure to add to those compiler flags. Done-with: Holger Freyther Change-Id: I931a197b8be72397e1eedfee09502eefc01c9d4f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+88
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