aboutsummaryrefslogtreecommitdiffstats
path: root/qtcreator.qbs
Commit message (Collapse)AuthorAgeFilesLines
* Version bumpEike Ziller2014-12-111-1/+1
| | | | | Change-Id: I44f6026c98e6d05ccf42cb634e6b95fa5a724a62 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Version bumpEike Ziller2014-12-011-4/+4
| | | | | Change-Id: Ieacb686c9c241159054543e2501d0354a63c1853 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Version bumpEike Ziller2014-10-281-2/+2
| | | | | Change-Id: If2233d241e83f82400e4e910e405eabebf887d58 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Fix library and plugin pathsEike Ziller2014-09-021-2/+2
| | | | | | | | | OSX: Move libraries from PlugIns/ to Frameworks/ other: move QmlDesigner plugins to plugins directory Change-Id: Ia266a3514ce6a496061daa044b3781daae0bc272 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Do not use deprecated Qt functionality.Christian Kandeler2014-08-291-1/+0
| | | | | | | | | | | | | | | Replace all* remaining deprecated Qt 4 functions with their Qt 5 counterparts. This means we no longer need to define the QT_DISABLE_DEPRECATED_BEFORE macro. This patch is relatively small because most source-compatible changes of this kind have been done before. * The one exception is the QmlDesigner, which uses QWeakPointer in a deprecated way all over the place. Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Merge remote-tracking branch 'origin/3.2'Oswald Buddenhagen2014-08-051-0/+1
|\ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/android/androidglobal.h Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
| * Set the minimum qbs version on the project.Christian Kandeler2014-07-311-0/+1
| | | | | | | | | | | | | | | | So people will understand why they can't open the projects with older Creator versions. Change-Id: Ie9291096ba001b0d31a58d834ba23c95a569d20f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Version bumpEike Ziller2014-07-241-2/+2
| | | | | | | | | | Change-Id: I9be7fde5b69b65e759100efb0595e7ca2ac5bfb9 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Fix version number.Eike Ziller2014-07-221-4/+4
|/ | | | | Change-Id: I657277feb77f33b345f58729cdc1c05b1fdb5528 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Version bumpEike Ziller2014-07-081-2/+2
| | | | | Change-Id: Iceded20db5c4d18b3ae075f99faacb351967277c Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Version bumpv3.2.0-beta1Eike Ziller2014-07-071-2/+2
| | | | | Change-Id: Id327afba79a865cf64b64fd817efe5c8b8797043 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-05-021-1/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/libs/qmljs/qmljsmodelmanagerinterface.cpp src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
| * qbs build: Adapt to function renaming.Christian Kandeler2014-04-151-1/+1
| | | | | | | | | | Change-Id: Ia4cc4447e59aaa4f283a7818847633bb7cf9a8aa Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Version bumpEike Ziller2014-04-151-1/+1
| | | | | | | | Change-Id: I499d35c45344c21eb4b8aae9e3bab4eb59e13544
| * Version bumpEike Ziller2014-04-041-4/+4
| | | | | | | | Change-Id: I0c690e5010ade7f3ebbb4a94163d7b44da13c10d
| * Version bumpEike Ziller2014-04-011-2/+2
| | | | | | | | Change-Id: I796d981e9b19a54d9ef9ef735d0f72d9ad0b1d34
* | Merge remote-tracking branch 'origin/3.1'Oswald Buddenhagen2014-03-181-1/+1
|\| | | | | | | | | | | | | | | | | Conflicts: qbs/imports/QtcTool.qbs src/plugins/git/giteditor.cpp src/plugins/qmldesigner/qmldesignerplugin.cpp Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
| * use new base import style in qbs filesJoerg Bornemann2014-03-111-1/+1
| | | | | | | | | | | | Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-03-041-3/+4
|\| | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I5b27eba0a9536d3e6867577ebf2b59d58a13b827
| * Version bumpEike Ziller2014-03-031-2/+2
| | | | | | | | Change-Id: Ibb0d0d64f379684b1ae8f7cd55a8a5436056432b
| * Support configurable library location in qbs build.Christian Kandeler2014-02-281-3/+4
| | | | | | | | | | | | | | | | | | And also in the qbs sub-project (for the qbs and qmake builds). This becomes possible with the qbs submodule update that is part of this patch. Change-Id: I8347a8c04a52bcb0682f32d808fb61a90ef3ba72 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Version bumpEike Ziller2014-02-251-2/+2
|/ | | | Change-Id: I005fb91b5e3cd5956edb108d0ec730db64cc98e9
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-10-101-1/+1
|\
| * qbs project files: Make use of new qbsSearchPaths property.Christian Kandeler2013-10-091-1/+1
| | | | | | | | | | Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Version bumpEike Ziller2013-10-041-4/+4
|/ | | | Change-Id: I6d0e52f57fe0e2c762ba12a9ed86de2458463772
* Remove remaining usages of Qt Quick 1 / DeclarativeEike Ziller2013-10-021-1/+0
| | | | | | | | | | | | | | | Qml editor widgets were still linking against declarative for qml type registering. Registering is no longer necessary since they are no longer used in QML. Also removes the unused qtcomponents. qmlpuppet of course still links against declarative, but that's not run in the same process. Task-number: QTCREATORBUG-10273 Change-Id: Ied12d38d58da5ff3bc694905b84dcd76cbce03af Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* qbs project: Add properties for pulling in additional resources.Christian Kandeler2013-10-011-0/+3
| | | | | | | We need this to build plugins located outside the source tree. Change-Id: Ie587b5e838bf0ce67b19d3222bbc40b53b888e69 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add qbs project files for autotests.Christian Kandeler2013-09-091-0/+2
| | | | | | | | | | Note: Since not all autotests are able to run from an installed location, we need to be able to start them from the build directory, which in turn forces us to set a destination directory for libraries and plugins, so they will be found at run-time. Change-Id: Idcf7e1333dfa6e9dbf745391b78c035f842ccc5a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Move some functions out of defaults.js and make them project properties.Christian Kandeler2013-09-091-0/+8
| | | | | | | | | The one that is left is the only one that's actually a function taking real input. This saves a number of includes. Change-Id: I77e777bbf6ed7ed4086f9a40de4dc3dd8c91a7af Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qbs project files: Add project property ide_source_tree.Christian Kandeler2013-09-091-0/+1
| | | | | | | The qmake project has this as well. Will become more useful later on. Change-Id: I6e9b6b1d1a46ea6263a6d5fac4cb30d883a3e077 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add QTCREATOR_COMPAT_VERSIONEike Ziller2013-07-091-0/+4
| | | | | | | | | | | Necessary for keeping compatibility within a minor series. When bumping versions, the compatVersion now needs to be taken into account too. Change-Id: I588947f885480889ff2f58481f72db76e3f1a9f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/2.8'Eike Ziller2013-06-271-203/+9
|\ | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f
| * qbs files: fix OS X checksJoerg Bornemann2013-06-261-8/+8
| | | | | | | | | | | | | | Change-Id: I618c1ad4bf328492403b48c8e398abd538f74787 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| * Version bumpEike Ziller2013-06-261-1/+1
| | | | | | | | Change-Id: Ibf982c6aac6b0d097d4ec764399197af7a2fe03a
| * Refactor qbs project files.Christian Kandeler2013-06-251-195/+1
| | | | | | | | | | | | | | | | | | | | | | | | - Use sub-projects. - Move the main application and the application header products into dedicated files. As a result, qtcreator.qbs becomes much simpler to understand, consisting now of just a bunch of global properties and a few sub-project references. Change-Id: Ic7300d489d3982394be5ad1d12a79a2914320298 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/2.8'Eike Ziller2013-06-251-18/+22
|\| | | | | | | | | | | | | Conflicts: src/plugins/fakevim/fakevimhandler.cpp Change-Id: I8101f18b87859924644471817d4f1408790d5628
| * update qbs filesJoerg Bornemann2013-06-201-18/+22
| | | | | | | | | | | | | | Use the new contains function and the targetOS list. Change-Id: I38b995eb9328e449befad85792512c45670cc8c9 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Merge remote-tracking branch 'origin/2.8'Eike Ziller2013-06-141-8/+11
|\| | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/documentmanager.cpp Change-Id: I6dc025bc0f31eb694c8d9e2dd4ea5cc888ee8a94
| * Consistently give qbs groups a name.Eike Ziller2013-06-061-8/+11
| | | | | | | | | | | | | | These nicely show up in the project tree in Qt Creator then. Change-Id: I9782f5953d61940e6c2a0f61f07bb15aaeba49d9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Version bump.Eike Ziller2013-05-311-1/+1
| | | | | | | | | | Change-Id: I69393d9b2aca0e4a702af8385020547bf89ba6fe Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Version bumpEike Ziller2013-05-301-2/+2
|/ | | | | Change-Id: I3719f99180012d82af603134360fdd9eedab24f9 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Version bumpv2.8.0-betatqtc/v2.8.0-betaEike Ziller2013-05-291-1/+1
| | | | Change-Id: I740c2db6660713aa8db192464c96ce91d827b0e5
* Merge remote-tracking branch 'origin/2.7' into 2.8Eike Ziller2013-05-271-1/+1
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/android/androiddebugsupport.cpp src/plugins/qtsupport/qtsupport.qbs Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
| * rename ProductModule into ExportJoerg Bornemann2013-05-271-1/+1
| | | | | | | | | | | | | | | | This fixes a bunch of warning when building with the updated qbs version. Change-Id: I644b4a4d0225b2e23ff1d9e1bf6d9d0136d6bbb5 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| * Bump versionKai Koehne2013-05-141-1/+1
| | | | | | | | | | Change-Id: Ia0714b038bc1655bb3b5b44a98f9fd6093bcdf79 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Qbs: fix rpaths and install names (mac)Eike Ziller2013-04-251-1/+2
| | | | | | | | | | | | | | Needs updated qbs submodule for rpath fixes and installNamePrefix. Change-Id: I6428409f34e87f299ff2d8c72268bee72c1ba2f2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Qbs build files: Install files to correct locationEike Ziller2013-04-221-3/+30
| | | | | | | | | | | | | | | | First step in fixing the Mac build Change-Id: I86659b9b46c01fc17fd93b8ffc3b378d2b580c36 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-04-181-1/+0
|\| | | | | | | | | | | | | Conflicts: src/plugins/pythoneditor/tools/lexical/pythonformattoken.h Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
| * Revert "Add Core as dependency for the qtcreator executable in the qbs build."Christian Kandeler2013-04-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a9754611f667d252ac015f2c8260caaf8dfbc909. That patch does not work as-is, because it introduces a dependency from the qtcreator library to the Core plugin without adding the respective directory to the list of rpaths. While doing just that would make Creator start up again, it seems conceptually wrong, because the Core plugin is explicitly loaded by the application itself. Removing the dependency altogether seems like the cleaner solution overall. Change-Id: Ife7b726449701a0a61eb48d98c04c55a55cf47e3 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Version bumpEike Ziller2013-03-211-1/+1
| | | | | | | | Change-Id: I4cd263b2f85ae4a342af68d156893bbaf9d2f90b
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 13:03:20 +0000