Commit Graph

106 Commits

Author SHA1 Message Date
Oswald Buddenhagen
868428cc63 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
2014-03-18 14:46:29 +01:00
Joerg Bornemann
84df758ec6 use new base import style in qbs files
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-11 14:20:22 +01:00
Eike Ziller
3ba9db48ed Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I5b27eba0a9536d3e6867577ebf2b59d58a13b827
2014-03-04 14:04:07 +01:00
Eike Ziller
5e7b693651 Version bump
Change-Id: Ibb0d0d64f379684b1ae8f7cd55a8a5436056432b
2014-03-03 10:27:59 +01:00
Christian Kandeler
c8881e7ca2 Support configurable library location in qbs build.
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>
2014-02-28 17:38:41 +01:00
Eike Ziller
9e40e5f7b0 Version bump
Change-Id: I005fb91b5e3cd5956edb108d0ec730db64cc98e9
2014-02-25 13:16:28 +01:00
Eike Ziller
f14d4b34e2 Merge remote-tracking branch 'origin/3.0' 2013-10-10 12:47:34 +02:00
Christian Kandeler
f1da03c73b qbs project files: Make use of new qbsSearchPaths property.
Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-09 18:08:56 +02:00
Eike Ziller
1a202ba5d0 Version bump
Change-Id: I6d0e52f57fe0e2c762ba12a9ed86de2458463772
2013-10-04 17:07:23 +02:00
Eike Ziller
0b82b54c24 Remove remaining usages of Qt Quick 1 / Declarative
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>
2013-10-02 11:39:23 +02:00
Christian Kandeler
1d11fd7344 qbs project: Add properties for pulling in additional resources.
We need this to build plugins located outside the source tree.

Change-Id: Ie587b5e838bf0ce67b19d3222bbc40b53b888e69
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-01 15:06:10 +02:00
Christian Kandeler
698144e32e Add qbs project files for autotests.
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>
2013-09-09 12:16:09 +02:00
Christian Kandeler
c2ac0902ed Move some functions out of defaults.js and make them project properties.
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>
2013-09-09 12:04:01 +02:00
Christian Kandeler
d0633f0ac9 qbs project files: Add project property ide_source_tree.
The qmake project has this as well. Will become more useful later on.

Change-Id: I6e9b6b1d1a46ea6263a6d5fac4cb30d883a3e077
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-09 12:01:39 +02:00
Eike Ziller
cc7c3c9623 Add QTCREATOR_COMPAT_VERSION
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>
2013-07-09 15:14:10 +02:00
Eike Ziller
c9128b7fdd Merge remote-tracking branch 'origin/2.8'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f
2013-06-27 14:24:57 +02:00
Joerg Bornemann
5a3c4cc8ef qbs files: fix OS X checks
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>
2013-06-26 16:46:18 +02:00
Eike Ziller
965966fb47 Version bump
Change-Id: Ibf982c6aac6b0d097d4ec764399197af7a2fe03a
2013-06-26 13:39:40 +02:00
Christian Kandeler
54ed620f35 Refactor qbs project files.
- 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>
2013-06-25 17:05:42 +02:00
Eike Ziller
e8469a2bab Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: I8101f18b87859924644471817d4f1408790d5628
2013-06-25 10:14:14 +02:00
Joerg Bornemann
cd37aef6cf update qbs files
Use the new contains function and the targetOS list.

Change-Id: I38b995eb9328e449befad85792512c45670cc8c9
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-20 15:31:39 +02:00
Eike Ziller
afe1d5ee65 Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/coreplugin/documentmanager.cpp

Change-Id: I6dc025bc0f31eb694c8d9e2dd4ea5cc888ee8a94
2013-06-14 16:21:04 +02:00
Eike Ziller
1b3bb5cb7e Consistently give qbs groups a name.
These nicely show up in the project tree in Qt Creator then.

Change-Id: I9782f5953d61940e6c2a0f61f07bb15aaeba49d9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-06 13:40:51 +02:00
Eike Ziller
80cef80910 Version bump.
Change-Id: I69393d9b2aca0e4a702af8385020547bf89ba6fe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-31 08:52:47 +02:00
Eike Ziller
4d131257f9 Version bump
Change-Id: I3719f99180012d82af603134360fdd9eedab24f9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-05-30 14:23:36 +02:00
Eike Ziller
cccc39ccc7 Version bump
Change-Id: I740c2db6660713aa8db192464c96ce91d827b0e5
2013-05-29 11:57:08 +02:00
Eike Ziller
45f8e241ba Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	src/plugins/android/androiddebugsupport.cpp
	src/plugins/qtsupport/qtsupport.qbs

Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
2013-05-27 17:17:40 +02:00
Joerg Bornemann
3eba7e44e5 rename ProductModule into Export
This fixes a bunch of warning when building with the updated qbs
version.

Change-Id: I644b4a4d0225b2e23ff1d9e1bf6d9d0136d6bbb5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-05-27 09:59:53 +02:00
Kai Koehne
8765ca6818 Bump version
Change-Id: Ia0714b038bc1655bb3b5b44a98f9fd6093bcdf79
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-14 17:15:40 +02:00
Eike Ziller
cba1da4678 Qbs: fix rpaths and install names (mac)
Needs updated qbs submodule for rpath fixes and installNamePrefix.

Change-Id: I6428409f34e87f299ff2d8c72268bee72c1ba2f2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-04-25 16:47:26 +02:00
Eike Ziller
e3fd25256d Qbs build files: Install files to correct location
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>
2013-04-22 16:58:09 +02:00
Eike Ziller
44931c0985 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
2013-04-18 09:22:19 +02:00
Christian Kandeler
639bc748b7 Revert "Add Core as dependency for the qtcreator executable in the qbs build."
This reverts commit a9754611f6.

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>
2013-04-12 14:49:16 +02:00
Eike Ziller
2bb4f6c175 Version bump
Change-Id: I4cd263b2f85ae4a342af68d156893bbaf9d2f90b
2013-03-21 13:34:58 +01:00
Eike Ziller
5d30493a8c Version bump
Change-Id: Iae22c2185fb0bde2509a0f6a9a975be4e7c2077c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-19 10:48:35 +01:00
Eike Ziller
3bc622400d Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp

Change-Id: Ic8590ad97d7349ed7601a49c4fd873ffc9a5f9b5
2013-03-12 10:56:52 +01:00
Joerg Bornemann
7f4eabc24f qbs files: remove superfluous version specifications from imports
Change-Id: I5f439e850cbfbb0a1a4802e2dd063687a75afc68
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-03-11 10:41:23 +01:00
Eike Ziller
e0ba5d955c Version bump
Change-Id: I97f84d16a092348332c18ad6ce34acc96d9a540f
2013-03-07 14:22:20 +01:00
Eike Ziller
c938b7ddf0 Version bump.
Change-Id: Ic3a6cf5d4ddb16034e7ba86c95870feee0713b6a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-06 15:47:53 +01:00
Christian Kandeler
5cd2c63f75 Fix qbs build.
Commit 7bf21ea94f changed "import" to
"Import" in qtcreator.qbs for some reason.

Change-Id: Ica2425ffa0331be51a0847ef4d3b3b2736fc323f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-01 14:19:19 +01:00
Orgad Shaneh
7bf21ea94f Add qbs submodule
Change-Id: I24952ea89519cf37c021d79f480c1ae907789161
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-01 11:48:56 +01:00
Oswald Buddenhagen
6bbdeec812 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/qnx/blackberrydeployconfiguration.cpp

Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d
2013-02-28 12:02:40 +01:00
Christian Kandeler
030186965f Adapt qbs files to new module property access syntax.
Change-Id: Idf2c04e250be7fcbbb927f423b5651d58a0d4bac
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-02-21 10:32:27 +01:00
jkobus
0e91d10878 Experimental integration of DiffEditor
After enabling the plugin go to Tools|Diff...

Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-18 18:15:51 +01:00
Oswald Buddenhagen
1ffe15a471 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I84145b02bf4f80848c0c1d762de34738f08bb78f
2013-02-18 14:16:53 +01:00
Christian Kandeler
a9754611f6 Add Core as dependency for the qtcreator executable in the qbs build.
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>
2013-02-14 15:53:33 +01:00
Kai Koehne
5be5542756 Version bump.
Change-Id: I8d00f000c618d1d781ca93efb3dd2fac60ab3507
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-11 12:04:00 +01:00
Christian Kandeler
f0c797256e Fix compilation with qbs on non-Linux, non-Mac Unix-like systems.
Change-Id: I075585d43f9e36a50c1945b3da4769744faa3f95
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-02-08 17:26:40 +01:00
Kai Koehne
1329b92ae9 Version bump
Change-Id: I86e238f87756e66fec1b8f3355ce289c55aa4f22
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-07 11:43:05 +01:00
Sergey Shambir
04b9d7614e Added PythonEditor plugin
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>
2013-02-07 10:17:09 +01:00