feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,174 Commits 108 Branches 368 Tags
b8e1860c885fe3e7cb901b96c3303dd9d70ea26c
Commit Graph

31174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aurindam Jana
e65b976b43 AndroidDebug: Removed unused qmlport member variable 
Change-Id: I339e2e4f4f0ce52b1220745357170a457a14be35
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-04-17 16:19:04 +02:00
Joerg Bornemann
1526011f32 update qbs submodule 
Also adjust the qbs plugin to changes.

Change-Id: I26f9beca50ceac1fd6b64ca79fe9881096afa1ce
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-04-17 16:17:14 +02:00
Aurindam Jana
39d8a01a62 QmlDebugging: Remove Ost related code 
Change-Id: I02c8b68cc9b000cdf3ead6bf547f43e51964c48a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-04-17 16:10:16 +02:00
Leena Miettinen
0bc2d64f1a Doc: add troubleshooting information to tutorial 
Add links to information about adding Qt versions and
compilers and configuring kits to the "Building and
Running an Example" tutorial.

Change-Id: I57892ae6ca58ccccfda6512b2b3b9f5bce17b4da
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-17 15:57:53 +02:00
Christian Kandeler
b1ad2553eb QbsProjectManager: Fix null pointer accesses. 
Change-Id: Ie57ecc36a676a3744317170eed7c4265becefe1b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-17 15:51:03 +02:00
Aurindam Jana
4e832deb02 Valgrind: Use a port from the device port range 
Change-Id: I046e536dfca0c84dd0dba4901aa316a31d4c4b43
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
 2013-04-17 15:49:09 +02:00
Erik Verbruggen
ae7bf03b48 C++: Removed unused ObjC keyword highlighting. 
Change-Id: Ie4db459ba9942d703ad3bc5a0f6805e39f729e9a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-04-17 15:43:22 +02:00
Eike Ziller
1610093ca3 Fix filesearch test. 
Clang complained that the operator== was not defined in Utils namespace.

Change-Id: I64853ddf3a081991cfb276b3be3a243fda87a740
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-17 15:30:46 +02:00
Robert Loehning
3fd74568b8 Squish: Updated checkLastBuild() 
Change-Id: Iebe27d2d4d08fde62398cd711ad557f16a6f3974
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-17 15:18:48 +02:00
Rafael Roquetto
11fa9797ec BlackBerry: Fix missing error string 
Change-Id: I674f90eb871fdb0cbb84207a402d434aca966d1e
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
 2013-04-17 15:03:51 +02:00
Joerg Bornemann
270da5c15c fix QmlJS dependency in todo.qbs 
Depends items will soon be case sensitive.

Change-Id: Id631058aacc5b8456ac66552b54730913568d851
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-04-17 14:56:28 +02:00
Przemyslaw Gorszkowski
17cd161a9d C++: fix cloning of templates 
Fix instantiation of templates(by cloning original symbols). Assigning of scope
for cloned symbol is taken from the symbol which is used to instantiate.

Task-number: QTCREATORBUG-9098
Change-Id: I066cc8b5f69333fabdaf2d4466b205baf08bd3f1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-04-17 14:10:32 +02:00
Daniel Teske
b55961d225 ApplicationOutput: Tweak popup/flash behavior on output 
- Change the option to switch between Flash and Popup on output
- Never popup on starting a application

Task-number: QTCREATORBUG-9120
Change-Id: If688822dad336e0f98a11bf2796483e79c0ae653
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-04-17 14:00:45 +02:00
Jesper K. Pedersen
44c8924bd3 Added documentation to ITextEditor 
Change-Id: If3348e4c8e87e4e3d6c701dc2b9738503f0549ad
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-04-17 14:00:13 +02:00
Eike Ziller
3c5d737834 Fix searching in search results (and other tree views). 
Task-number: QTCREATORBUG-9066

Change-Id: I76b7916b4ce64c400c175e72edc2b0a3ef015156
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-04-17 13:48:53 +02:00
Martin T. H. Sandsmark
23bb4ff631 Custom wizard: Add setting for PathChooser's expectedKind. 
Change-Id: Iff8955d0db20c5c00f8a1745ab1f4310482254cb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-04-17 13:26:10 +02:00
Daniel Teske
7298984039 Android: Fix reload prompt on changing settings in the package step 
Change-Id: I102a4843652029dff757e12594efc4d5e5e50a99
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-04-17 13:25:59 +02:00
Tobias Hunger
e255f15ac3 Qbs add Qt overlay icon to qbs files 
Change-Id: I9cd6ec7144dc1afce9d8193f5aa6719ed8d29af4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-17 12:41:32 +02:00
Tobias Hunger
c3ad09446b Qt4PM: Move icons and mimetypes into QtSupport 
Change-Id: I285b30d71951ad849e31c56daaa8d162a8efea9f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-04-17 12:26:28 +02:00
Aurindam Jana
cb4bfaf905 QmlProfiler: Use a port from the device port range 
Check for free ports from the range of device ports instead of
using a fixed port.

Change-Id: I30b2e141ae6bce1ddd90294d4b802e2c9943424b
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
 2013-04-17 11:36:09 +02:00
Daniel Teske
53ce5340d6 RemoteLinux Device Wizard: Give the private key file chooser a title 
Change-Id: I325e3ae5c3ecefe61add951b0f3a2ed5832be754
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-04-17 11:25:38 +02:00
Thomas Hartmann
e311761b57 Fix compilation for Mac OS X 
CONFIG += c++11
does not work with clang atm.

Change-Id: I7750b333296ccedf999d2610cca126530f737777
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-17 11:23:33 +02:00
Nikolai Kosjar
96278750f7 CppEditor: Concatenate strings with + instead of % 
operator+ is the official way for concatenating strings whereas operator%
is an optimization that needs certain defines.

The code which was using operator % is not performance critical.

Change-Id: I4c7f4310cc5708aa5f9009672d932f913a2eb59f
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-04-17 10:10:37 +02:00
Thomas Hartmann
9bfb5e3eef QtSupport: Adding feature for QtQuick.Controls 
Change-Id: Ic5ef2d7d452046cd446204b88346533f41b1a562
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-04-17 09:23:55 +02:00
Orgad Shaneh
e4714f80c4 Settings: Add a filter for mime types 
Change-Id: I05213ca74cf3838c923ce6117ffdde28546d465f
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-04-17 09:06:39 +02:00
Orgad Shaneh
fcf8575163 Fix Windows build 
Change-Id: If00c202e6313402faff962398c91dbe41ad30682
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-04-17 09:06:07 +02:00
El Mehdi Fekari
c6449e55ff Qnx: Auto detect device PIN when requesting debugToken 
Task-number: QTCREATORBUG-9062

Change-Id: Ib6bc2f2da6f6cfe9e78eb1d9d7e9d8f6abbd9948
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
 2013-04-16 22:50:33 +02:00
Leena Miettinen
c1261045fc Doc: default encoding set to UTF-8 in text editor 
UTF-8 is required by Qt 5.

Change-Id: I7750b337296c8edf997d2610cca126530f737c37
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-16 18:31:12 +02:00
Marco Bubke
ea8c98c2d8 QmlDesigner: Remove stupid code 
Change-Id: Ie56c5e26a7ec077b794a4993679ab80a716740ce
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-16 16:52:26 +02:00
Marco Bubke
2b698e31ed QmlDesigner: Add override to qml2puppet 
Change-Id: Ibdf07c4a35b40f3fc78300a1675270f8295bec42
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-16 16:52:20 +02:00
Marco Bubke
e13e6550f5 QmlDesigner: qml2puppet is using c++ support 
Change-Id: Ie6ac96b713775db13a02cecdc74849ad97f017e5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-16 16:52:15 +02:00
Marco Bubke
de822ec5ca QmlDesigner: Remove old paint function in instances 
Change-Id: I5da0c624b467448dc6f16a88fa3ad3682f423c20
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-16 16:52:11 +02:00
Marco Bubke
e7206d5b04 QmlDesigner: Fix reparent function in qmlpuppet 
Change-Id: I7f30f23c5f2af24f3715bae2b1f4b7be044b0da7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-16 16:52:06 +02:00
Marco Bubke
5d3c1a2a2b QmlDesigner: Remove old functions in instances 
Change-Id: If886ca208de775472c4e97e986c2f4df81615959
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-16 16:52:00 +02:00
Marco Bubke
0de9237699 QmlDesigner: Add PropertyName usage in instances 
Change-Id: Ia7eb8730c61347833c70a3d62787c10e2a3134ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-16 16:51:54 +02:00
Daniel Teske
09f20adc7b Android: Only show android sdk versions that are supported by qt 
That is at least android-9 for qt 5.

Task-number: QTCREATORBUG-9067
Change-Id: I977f8a35e5d2db2c645fe1a1bc52ef5d7b9f8b35
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-04-16 14:04:59 +02:00
Daniel Teske
8b07cc395d ProjectExplorer: Fix endless loop 
Task-number: QTCREATORBUG-9140
Change-Id: Idb26f9ee0581bc426b144310cab76ddbf5f84d2f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-16 13:29:49 +02:00
Tobias Hunger
83b0c7d710 Fix warning 
Change-Id: I21ca429d6add9d9757ecccef8776b3b762b21cce
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-16 13:21:38 +02:00
Tobias Hunger
4a58ea11fe Qbs: Add convenience methods to retrieve qbs information to QbsProject 
... and use them.

Change-Id: Ic8e3fdaffa2bc41ccbbc39baa4ef07edb5d9241d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-16 13:21:06 +02:00
Tobias Hunger
14b3304148 Qbs: Simplify code a bit 
Change-Id: I538f146b395d9908e0b49475ba3b5590db9e495e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-16 13:17:46 +02:00
Tobias Hunger
8fc3c8aff0 PathChooser: Update tooltip after change of base directory 
Change-Id: I744ede2c6e011d1b7914b4e2922179fd5c366a69
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-16 13:17:28 +02:00
hjk
fb72d5324e C++: Also cache result of misses in resolveFile() 
Change-Id: Ib501bbe16548b194ff5028a1b3ab74c5f0e3230d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-04-16 12:36:00 +02:00
hjk
980fe3203d C++: Streamline preprocessor expansion buffer handling 
Change-Id: If86c73945808e871f60fdf231b91e02f66bd1b32
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-04-16 12:30:45 +02:00
Daniel Teske
237c82fe47 Remove explicit debug and release arguments in makestep 
They serve no purpose, the default target in debug_and_release Makefiles
is to build only debug or release.

Change-Id: I4e403a2d25e09c8f31a4619d7588bfb34a5acf5e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-16 12:10:28 +02:00
Erik Verbruggen
3173f6fb3e C++: fix highlighting for template parameters for function calls. 
Change-Id: Ie0133893d8b8d35ea2aa599cb8f7d5c2cc55271e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-04-16 12:05:06 +02:00
Erik Verbruggen
a0d6df7bd8 C++: also refresh files not in the project when project changes. 
System headers and other file which are not explicitly mentioned in the
project must be reparsed when the project changes.

Task-number: QTCREATORBUG-9056
Change-Id: I32f1206d241a078a4d9b15fac5813f365a1ba303
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-04-16 11:56:18 +02:00
hjk
c39b582e58 C++: Preprocessor output buffer is always present 
Change-Id: I896423172aed0e19feaaf9144ed5f18ba99c720b
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-04-16 11:33:50 +02:00
hjk
a1c7c47cc0 C++: Simplify Lexer::yyinp() 
... by assuming we operate on NUL-terminated data, which is
(in theory) guaranteed by (non-raw) QByteArray which we have.

Change-Id: I855d01ea0dee5328ec737fbabee1086d7a28aa5a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-04-16 11:26:30 +02:00
Christian Kandeler
c95d1705aa Qbs: Improve build and clean step widget layout for full-screen view. 
Change-Id: I0bc3c205f5f48fc0651629aecb3f46c106a858fd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-16 10:56:21 +02:00
Fawzi Mohamed
a019c4c7a1 qmljs: update qt-creator builtins.qmltypes, and use them for qt<-4.8.5 
qmlplugindump of qt <= 4.8.5 does not output exportMetaObjectRevisions
so do not use its output for the builtins.

Task-number: QTCREATORBUG-9076
Change-Id: I82bdd325ef15f800c70c830ead4867787f6b7b0a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-04-16 09:57:32 +02:00