summaryrefslogtreecommitdiff
path: root/qtcreator.qbs
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Version bumpEike Ziller2013-03-191-2/+2
| | | | | | | | | | Change-Id: Iae22c2185fb0bde2509a0f6a9a975be4e7c2077c Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-03-121-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/debugger/gdb/gdbengine.cpp Change-Id: Ic8590ad97d7349ed7601a49c4fd873ffc9a5f9b5
| * qbs files: remove superfluous version specifications from importsJoerg Bornemann2013-03-111-1/+1
| | | | | | | | | | Change-Id: I5f439e850cbfbb0a1a4802e2dd063687a75afc68 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| * Version bumpEike Ziller2013-03-071-1/+1
| | | | | | | | Change-Id: I97f84d16a092348332c18ad6ce34acc96d9a540f
| * Version bump.Eike Ziller2013-03-061-1/+1
| | | | | | | | | | Change-Id: Ic3a6cf5d4ddb16034e7ba86c95870feee0713b6a Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * Fix qbs build.Christian Kandeler2013-03-011-1/+1
| | | | | | | | | | | | | | | | Commit 7bf21ea94f800b4540a8d720f2f0b4341e4b5652 changed "import" to "Import" in qtcreator.qbs for some reason. Change-Id: Ica2425ffa0331be51a0847ef4d3b3b2736fc323f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * Add qbs submoduleOrgad Shaneh2013-03-011-1/+1
| | | | | | | | | | Change-Id: I24952ea89519cf37c021d79f480c1ae907789161 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/2.7'Oswald Buddenhagen2013-02-281-1/+2
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/qnx/blackberrydeployconfiguration.cpp Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d
| * Adapt qbs files to new module property access syntax.Christian Kandeler2013-02-211-1/+1
| | | | | | | | | | | | Change-Id: Idf2c04e250be7fcbbb927f423b5651d58a0d4bac Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * Experimental integration of DiffEditorjkobus2013-02-181-0/+1
| | | | | | | | | | | | | | After enabling the plugin go to Tools|Diff... Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee Reviewed-by: hjk <hjk121@nokiamail.com>
* | Merge remote-tracking branch 'origin/2.7'Oswald Buddenhagen2013-02-181-2/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I84145b02bf4f80848c0c1d762de34738f08bb78f
| * Add Core as dependency for the qtcreator executable in the qbs build.Christian Kandeler2013-02-141-0/+1
| | | | | | | | | | | | | | | | Rationale: "qbs run -p qtcreator" will otherwise fail on a clean build dir, because Creator cannot run without the Core plugin. Change-Id: I87c16847189fc09bcc4903e865b99b6ba472f1f0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Version bump.Kai Koehne2013-02-111-1/+1
| | | | | | | | | | Change-Id: I8d00f000c618d1d781ca93efb3dd2fac60ab3507 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
| * Fix compilation with qbs on non-Linux, non-Mac Unix-like systems.Christian Kandeler2013-02-081-2/+2
| | | | | | | | | | Change-Id: I075585d43f9e36a50c1945b3da4769744faa3f95 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Version bumpKai Koehne2013-02-071-1/+1
| | | | | | | | | | Change-Id: I86e238f87756e66fec1b8f3355ce289c55aa4f22 Reviewed-by: hjk <hjk121@nokiamail.com>
* | Added PythonEditor pluginSergey Shambir2013-02-071-0/+1
| | | | | | | | | | | | | | | | | | Contains lexical highlighter, indenter and file wizard. Icon loaded from theme, if possible. Class wizard will be added later since it needs to extend libUtils. Change-Id: If723867c01e9be83371424e406d116805c88c2b0 Reviewed-by: hjk <hjk121@nokiamail.com>
* | Bump Qt Creator versionKai Koehne2013-02-051-1/+1
|/ | | | | Change-Id: If7972209cb9346217af43f9c1faa667bf644a54a Reviewed-by: hjk <hjk121@nokiamail.com>
* Initial version of qbs pluginTobias Hunger2013-02-011-0/+1
| | | | | Change-Id: I0e0ae07affccfeab167303bb976475649a630e65 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Adapt qbs project files to new installation approach.Christian Kandeler2013-01-241-5/+8
| | | | | | | This need a qbs build >= commit 5cdf94de to work properly. Change-Id: If86aedf9e3f9d01ad1202e03221e49698d517666 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qbs files: Remove src/share/share.qbsOrgad Shaneh2012-11-121-1/+0
| | | | | | | Merged into share/share.qbs Change-Id: Ia60124a851d234c69e5bc1a57a9e390863327f95 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-251-9/+15
| | | | | | | | Conflicts: share/share.qbs tests/auto/icheckbuild/icheckbuild.pro Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
* qtcreator.qbp renamed to qtcreator.qbsJoerg Bornemann2012-10-241-0/+194
The .qbp file extension is deprecated. Change-Id: I8729b7a4a35ffe0359d9eb81354dbe8b7fcfce6d Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
View Lorry Controller Status