feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
68,568 Commits 108 Branches 368 Tags
ac47d51bfb379b8c3b51d832d54a90dba18a518f
Commit Graph

319 Commits

Author SHA1 Message Date
Oswald Buddenhagen
d77883c16a Merge remote-tracking branch 'origin/2.7' 2013-04-18 15:18:34 +02:00
Christian Kandeler
7dc52d1a54 Fix module name capitalization in pluginspec.qbs. 
Change-Id: I66ca1ad22f8a857582e6d3fdb0bf2dfc8334628a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-04-18 14:18:55 +02:00
Oswald Buddenhagen
f9f8cd354b auto-generate <dependencyList> in .pluginspec files 
Change-Id: I8bb9b4eb0ae5ed9b283da422be882603ae0e1b49
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-04-11 12:52:03 +02:00
Oswald Buddenhagen
8b1a98b309 remove bogus uppercasing of the replaced variable name 
Change-Id: I8b506a7ab52a12f3ab8a006788fea7ab5c29c8b8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-04-02 17:14:18 +02:00
Oswald Buddenhagen
c61210089f define QT_CREATOR centrally 
numerous "3rdparty" libraries have respective #ifdefs, and consequently
the define is added in several places. it's quite a mess with the .pr?
and .qbs files, though. solve the problem by sidestepping it.

Change-Id: I5a6b1ba7cfe96b44f0a4f4ef9738900906a44316
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-04-02 12:20:37 +02: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
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
Christian Kandeler
0cf4f0885b Adapt qbs project files to new installation approach. 
This need a qbs build >= commit 5cdf94de to work properly.

Change-Id: If86aedf9e3f9d01ad1202e03221e49698d517666
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-01-24 13:02:32 +01:00
Orgad Shaneh
88267a3299 Generalize QT_NO_CAST_FROM_ASCII 
Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-16 01:14:08 +01:00
Orgad Shaneh
7d36034f03 qbs files: Compile everything with QT_NO_CAST_TO_ASCII 
It appears in qtcreator.pri

Change-Id: Iea74d4d06146f94fd1022eaae3074da88d6e22f3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2012-11-22 08:28:44 +01:00
Eike Ziller
d5d1c5e394 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
 2012-10-09 11:50:17 +02:00
Joerg Bornemann
f0e40373d2 qbs files: change file tag of Qt5 plugin metadata files 
Change-Id: I3d20ad6efe4c6ed8cd87717ef4fdd58a739ad634
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2012-10-08 13:27:08 +02:00
Eike Ziller
b947861c59 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
 2012-09-19 18:02:46 +02:00
Christian Kandeler
40d919eed8 Support built-in testing infrastructure with qbs build. 
I.e. define WITH_TESTS for debug builds or if the respective
environment variable is set.

Change-Id: I2764ece50d0783e8cb030b1695e6f59cf6063248
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2012-09-13 10:46:51 +02:00
Yuchen Deng
0d20c5b796 Fix qbs code style 
Change-Id: Ia3e4df528d391580064efbeeab75016335a4299d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2012-06-19 11:22:40 +02:00
Daniel Teske
f3b2ca7d19 Add qbs files for android 
Change-Id: I1739879579245303795fc7c6d5bc2206ffb44bcb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2012-04-25 15:57:48 +02:00
Joerg Bornemann
65f9152372 qbs files: generate json files from .pluginspec files for Qt5 
Change-Id: I70ce3d8b6ead88b2bb7a595c8aaf465d441ffe98
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-04-13 16:26:00 +02:00
Orgad Shaneh
f1c299a85e Qbs: Allow provider specification for plugins 
Change-Id: I2016da500a9e81d8b2065c4c1c26a15d59c15abf
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2012-04-05 15:08:57 +02:00
Joerg Bornemann
ff92cdec43 add qbs files 
Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38
Reviewed-by: hjk <qthjk@ovi.com>
 2012-02-20 19:18:18 +01:00