feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
45,380 Commits 108 Branches 368 Tags
0dc1cec7bfd57fe9ee044ccebd40f5ec833ddf93
Commit Graph

97 Commits

Author SHA1 Message Date
Orgad Shaneh
8dadafb9e0 Revert "Qbs: Replace deprecated qbs.getEnv with Environment.getEnv" 
We still need to support qbs 1.4.

This reverts commit 7c8744e6cd.

Change-Id: Ic8207a4994ec59665374a94bd8ee921b067856db
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2016-04-12 07:40:04 +00:00
Orgad Shaneh
7c8744e6cd Qbs: Replace deprecated qbs.getEnv with Environment.getEnv 
Change-Id: Iebca0ae87bc3dee65fbc0f16c3c7f6f8afc0fead
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
 2016-04-11 19:33:42 +00:00
David Schulz
610176358b version bump 
Change-Id: Ie8f7806fd40af9da5c60f851ef6db5226199bfc0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2016-03-30 05:34:53 +00:00
Christian Kandeler
a081e8c96f qbs build: Fix autotest runner on Windows. 
The tests need to find Creator's libraries and plugins at run-time.

Change-Id: Ided40e70693650a0099661dd961223c5b68da646
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
 2016-01-25 09:39:52 +00:00
Eike Ziller
e492d63aa3 Version bump 
Change-Id: Ie9cfae74f7566a171de5fd281c8b2f7885f5a5b2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-12-15 10:57:45 +00:00
Eike Ziller
9554495bb1 Merge remote-tracking branch 'origin/3.6' 
Conflicts:
	src/plugins/baremetal/gdbserverproviderprocess.cpp

Change-Id: I1ba618db9db6669edada6477c05a1b56b7b5b430
 2015-12-07 15:55:35 +01:00
Eike Ziller
fb1e9bc785 Version bump 
Change-Id: Ibca6fcaf2eeb997179fc9dda0f1dc94dd333d973
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-12-04 08:58:32 +00:00
Eike Ziller
310ae09996 Merge remote-tracking branch 'origin/3.6' 
Change-Id: I68512c775ed25b51c8b0abe1818c9c7c5955874c
 2015-10-30 16:08:03 +01:00
Eike Ziller
411c79a599 Version bump and use binary artifacts 3.6 
Change-Id: I57f643b0400c945f2bfe3513ef23a9eccc083100
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
 2015-10-30 08:44:36 +00:00
Jake Petroules
59ac67c0bb Qbs: properly install Info.plist, PkgInfo, and app icon. 
The icns files have also been moved into an asset catalog because
"source code" as a rule should be stored in the preferred form of
modification.

Change-Id: I883db5704a46d8d7cf601f7fb4471619ebbc34bf
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-10-21 16:18:51 +00:00
Eike Ziller
cd5f9f6ff8 Merge remote-tracking branch 'origin/3.5' 
Change-Id: I7b3ef276d438ff0f184a649153e8aeec08a9f8c9
 2015-08-04 13:16:03 +02:00
Christian Kandeler
b67a8e31dd qbs build: Remove outdated property. 
Change-Id: I67e995793d1a818e6b0f2536c2410925f2edffa6
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
 2015-07-18 06:42:59 +00:00
Eike Ziller
26eca3d15a Version bump 
Change-Id: I3176d21a40001779bf6c19b05a3f9ff068695a8e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-07-10 12:23:48 +00:00
Eike Ziller
d6da70916d Merge remote-tracking branch 'origin/3.5' 2015-07-10 14:08:29 +02:00
Eike Ziller
387e4917a6 Version bump 
Change-Id: I9f8d177d34cc277fdea51da5224fbc4c7ee8a589
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-07-09 13:50:05 +00:00
Christian Kandeler
6d5a5aff94 Use a proper libexec path for Unix builds. 
Change-Id: I036c806af47f07e60408a90d3a4e181a6773f866
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-07-09 09:08:01 +00:00
Eike Ziller
4dd95aa5d4 Merge remote-tracking branch 'origin/3.4' 
Change-Id: Id13cbdf2f7047366e543c91fbe7c21a9c4759e56
 2015-06-17 12:04:21 +02:00
Eike Ziller
52d89196bc Version bump 
Change-Id: I4a9cde2300b1cc14feadaa6240fefebc57fd0e19
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-06-16 08:51:45 +00:00
Christian Kandeler
8eb7c3efad Adapt to qbs' libexec infrastructure. 
Change-Id: Ic2d609e017d201b7b3e0b3bcb08359652428aeaa
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
 2015-06-03 15:29:55 +00:00
Eike Ziller
e2705d4ecb Version bump 
Change-Id: Icba0aa76b9db40c46c026177637c5ea92593c4c0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-05-15 07:30:03 +00:00
Eike Ziller
841046aeda Version bump 
Change-Id: Ie12f7ab510b6d9857772df9f36c99e72b8766520
 2015-04-01 11:24:41 +02:00
Eike Ziller
f4a3b4ca5f Merge remote-tracking branch 'origin/3.4' 
Change-Id: Ib5ce531102eeef86a34ee78e6990791cf4c910c4
 2015-02-18 16:35:46 +01:00
Christian Kandeler
05f8a2c813 qbs build: Introduce convenience project property sharedSourcesDir. 
Change-Id: I69aacc7391e6e25e66eae1fb54b3c1cfb18679ee
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
 2015-02-18 14:49:06 +00:00
Eike Ziller
0763f44504 Bump version 
Change-Id: I5ae9ff3bbda235781b490889be292af7812e720e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-02-18 08:23:37 +00:00
Christian Kandeler
cdc6d45a8a qbs build: Add the possibility to include additional autotests. 
For plugins that don't live in the main repo.

Change-Id: Iebe4b05bfb60f86531ec82a4ae555fdfaac39ead
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
 2015-01-26 12:38:10 +01:00
Christian Kandeler
1199a93fc0 qbs build: Make use of AutotestRunner. 
And fix some autotest project file problems uncovered by this.

Change-Id: Id2f46aeab31ccfbcffe43bd23af8115c69f57849
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
 2014-12-19 15:10:36 +01:00
Robert Loehning
06a47dd56c Version bump 
Change-Id: I4c4a77b22cbc46b2970c89ed4b50f0c6338eb575
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2014-11-28 16:55:15 +01:00
Eike Ziller
3335e8a475 Version bump 
Change-Id: If2233d241e83f82400e4e910e405eabebf887d58
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2014-10-28 11:28:57 +01:00
Eike Ziller
deea0022f7 Fix library and plugin paths 
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>
 2014-09-02 09:24:10 +02:00
Christian Kandeler
1d5091e48f Do not use deprecated Qt functionality. 
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>
 2014-08-29 14:10:41 +02:00
Oswald Buddenhagen
f3a61e8bf7 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidglobal.h

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
 2014-08-05 14:24:23 +02:00
Christian Kandeler
3c6b2691b7 Set the minimum qbs version on the project. 
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>
 2014-07-31 14:54:40 +02:00
Eike Ziller
a2c18fc6ec Version bump 
Change-Id: I9be7fde5b69b65e759100efb0595e7ca2ac5bfb9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-07-24 16:35:33 +02:00
Eike Ziller
f42358a16e Fix version number. 
Change-Id: I657277feb77f33b345f58729cdc1c05b1fdb5528
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-07-22 16:35:17 +02:00
Eike Ziller
69fe69f6ba Version bump 
Change-Id: Iceded20db5c4d18b3ae075f99faacb351967277c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-07-08 13:23:32 +02:00
Eike Ziller
e5504be861 Version bump 
Change-Id: Id327afba79a865cf64b64fd817efe5c8b8797043
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-07-07 16:54:53 +02:00
Eike Ziller
0fb641c90e Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
 2014-05-02 10:00:20 +02:00
Christian Kandeler
4909428220 qbs build: Adapt to function renaming. 
Change-Id: Ia4cc4447e59aaa4f283a7818847633bb7cf9a8aa
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-04-15 16:57:54 +02:00
Eike Ziller
143b51c563 Version bump 
Change-Id: I499d35c45344c21eb4b8aae9e3bab4eb59e13544
 2014-04-15 13:28:28 +02:00
Eike Ziller
8864d05329 Version bump 
Change-Id: I0c690e5010ade7f3ebbb4a94163d7b44da13c10d
 2014-04-04 13:14:41 +02:00
Eike Ziller
7f0b106226 Version bump 
Change-Id: I796d981e9b19a54d9ef9ef735d0f72d9ad0b1d34
 2014-04-01 13:07:28 +02:00
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