feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
23,926 Commits 108 Branches 368 Tags
c1c0f357da40fe5607b0af484255fbf3b51aae7f
Commit Graph

23926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fawzi Mohamed
c1c0f357da zeroconf: daemon killall on windows (and linux) 
Change-Id: Ibbc960d9caf26fb8ff56d37209fe5011931ed3b5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2012-04-26 12:58:57 +02:00
Thiago Macieira
977c983bde Fix build on Unix. 
sleep(3) is defined on unistd.h, so you need to include it.

/home/thiago/src/qt/creator/src/plugins/android/androidconfigurations.cpp(556): error: identifier "sleep" is undefined

Change-Id: I71c76bd7f085240d9e3ceaad1ac062387cf7c838
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-26 12:58:40 +02:00
Konstantin Tokarev
5807f04c1e Hide subproject actions in non-qmake projects. 
Change-Id: I5780308d3dd096aa1f818117d21617901f087f11
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-26 12:00:13 +02:00
hjk
9a2d6eb5eb debugger: minimal support for boost::bimap 
Only shows the size.

Change-Id: Icdd50fd21abde68d7e39a0fdbc92f6156e915fe4
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-26 08:49:12 +02:00
hjk
bc01283481 preprocessor: add test cases for <=, == and >= 
Change-Id: I126143daeb572a555b73dc33ad7996b22c1387f8
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-26 08:48:52 +02:00
Dmitry Savchenko
8563d032f7 Check keyword name before accepting in KeywordDialog in Todo plugin. 
* Make sure keyword name is not already used in existing keywords.
* Make sure keyword name doesn't contain spaces or a colon.

Change-Id: I2856d122ba2fc6a7a60dc760dcd3d536523db5bc
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-04-26 08:06:18 +02:00
Eike Ziller
71d9f33bef Merge remote-tracking branch 'origin/2.5' 2012-04-26 07:06:04 +02:00
Christian Kandeler
d6d04d6786 Device support: Remove unneeded include. 
Change-Id: I3719299f6d9d11c9c89d0f2f4a0c0ada34d699a6
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2012-04-25 21:38:16 +02:00
Christian Kandeler
4e9b6cbe9c Device support: Clean up DeviceManager API. 
- Remove redirection of setDisplayName() via DeviceManager. This
inflated the API (method + signal) only for the settings widget, which
can handle this case perfectly well by itself.
- Make the public API Id-centric. Indexes were used in a lot of places
for historical reasons (the device manager was a model once), but they
made the API inconsistent and sometimes even plain stupid (notably the
deviceRemoved() signal).

Change-Id: I77601ac05726d1cd841ae213397f26048dddc585
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-04-25 17:48:55 +02:00
Tobias Hunger
83192865e7 Fix warnings on windows 
Fix warnings on windows about overwriting virtual functions

Change-Id: I83e0262627faa4ce23624678de1b69f30624dc6a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-04-25 17:14:07 +02:00
Daniel Teske
fd547e4c5b "Close All Projects" also closes all editors, adjust title to that 
Task-number: QTCREATORBUG-6991

Change-Id: I817c2e16ae131bc30f3b6cf00f7afeeb53e0a159
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-04-25 17:04:43 +02:00
Leena Miettinen
4674d46197 Doc: update Valgring sreenshots 
Move link to the top level topic

Change-Id: I9a1c136edcc55ed17a38bbeb90a167284a39e34b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-04-25 17:03:17 +02:00
Leena Miettinen
5a304ae62b Doc: update misc screenshots 
Change-Id: I03e68f4aae6ca96739c1060764f2cf4a72d7ebab
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-04-25 17:02:15 +02:00
Leena Miettinen
4a1e317f7a Doc: update screenshot for external tools 
Change-Id: I3bdb4fd40c12efbd5d40eccb1f636748ec3aa501
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-04-25 17:01:04 +02:00
Tobias Hunger
cfb9c26c30 Fix build failure with Qt 4.7 
Change-Id: I81c6d6914bd87682c77e81f96065bfc586061b37
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-04-25 16:29:59 +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
Robert Loehning
c15b727345 Squish: Added workaround for Qt 4.8.1 
Change-Id: I6f0c3a1549e127dad9dc7278c72dcfc782f86309
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-04-25 14:28:42 +02:00
Friedemann Kleint
232af02fab tcpportsgatherer.cpp: Fix compilation with MinGW/gcc 4.7.1. 
Change-Id: If8e49e5ce4a454c03f40f325e2d17d8dd2685430
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-04-25 14:00:09 +02:00
hjk
feba990f6e preprocessor: swallow ) after defined(... 
Task-number: QTCREATORBUG-7256
Change-Id: I6149e56e5f50f75c9e039be9c162036a3890e2d7
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-25 13:41:51 +02:00
Tobias Hunger
75ca41be18 Build fix 
Change-Id: I4a2ff7292d7b14017d1528e6aeaa68a77b906178
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-04-25 13:13:48 +02:00
hjk
fab38eb621 debugger: add some webkit access to manual test 
Change-Id: Ibb20d683b4e3052d74721cbe7d6b2e6bd4a6daa2
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-25 12:32:20 +02:00
Christian Kandeler
2994b88d90 Device support: Use value semantics for Core::Id. 
We had a mixed style until now (mostly using const refs). Use value
semantics everywhere for consistency and hope that the class never gets
heavier.

Change-Id: Ic9536f87b01a76252bd8643c8681b3dc9067a266
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-04-25 11:57:19 +02:00
Tobias Hunger
df5dab6382 Use Core::Id in project-related objects 
Use Core::Id for all the project related objects in favor of plain
QStrings.

Change-Id: I790ab40cb29899efdb49c413a77609486f52e683
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-25 11:49:19 +02:00
Aurindam Jana
cf26765c62 QmlJSInspectorToolBar: updateDesignModeActions() 
Call updateDesignModeActions() after updating design mode flag.

Change-Id: Ibfedb0beb0d58cc3f3a27944ea726fea31015dcc
Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-04-25 11:19:12 +02:00
Friedemann Kleint
6595e1d443 Adapt CDB debug helpers to pending container changes. 
- Adapt QByteArray, QString, QVector.
- Disable QMap for Qt 5.

Change-Id: I113d546fc69165b504ce4998b3bf7ac9c44130fb
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-25 11:18:30 +02:00
Aurindam Jana
fa6817a6fa QmlCppEngine: Update Views when switching between engines. 
Change-Id: I90958e77c4d8c845ef6e55fe65eaffe0ac24dcc5
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-04-25 11:15:09 +02:00
Sergey Belyashov
e412627bd9 Updated Russian translation 
Change-Id: I11b8318ff45560f7ae23ac14aa448b8999ee8aa1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-04-25 11:02:41 +02:00
Orgad Shaneh
75c46a8ded qbs files: Add QT_NO_CAST_FROM_ASCII to git and todo 
Change-Id: Ic9f61a8e08e591853b00ef31b418aa59fd771240
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2012-04-25 10:58:30 +02:00
hjk
7f1f282111 preprocessor: some code style in auto test 
Change-Id: I1381ce17098a87dbc3924dc86902d7cc1b1eec76
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-25 09:30:34 +02:00
Kai Koehne
b834de670d QmlJsInspector: Fix compilation breakage on Windows 
MSVC doesn't take the 'using namespace' into account in moc file
(that isn't in a particular namespace).
Move it out of QmlJSDebugger::Internal.

Change-Id: Iee4a89a9ecf38607791e1ccf884a15cb8b0892a7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-04-25 08:36:14 +02:00
Orgad Shaneh
537af056cf qbs files: Set consoleApplication by debug mode 
Debug build has console, release doesn't

Task-number: QTCREATORBUG-7224
Change-Id: I518da8460218236652f856f1e25c517769090e75
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2012-04-24 18:28:55 +02:00
Daniel Teske
2aec3d554c Mini Target Selector: Enter/Return/Space close the widget now 
Task-number: QTCREATORBUG-7332
Change-Id: Ie88964e3ec924c4eac99adc5a7da87b166b0a0b4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2012-04-24 17:23:03 +02:00
hjk
837cbd01e6 make manual process test compile with namespaces 
Change-Id: I18427130c15f502eb1cec4c383f8bb5b14dcd6c7
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-24 17:13:48 +02:00
hjk
c0d7953230 debugger: simplify #if/#else structure to make lupdate happy 
Change-Id: I0f9668681645a0bedaccd45abb806e59905d561c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-04-24 17:07:36 +02:00
hjk
071b24d97e debugger: fix translation contexts 
* add a few Q_OBJECT
* change DebuggerRunControl::tr() to DebuggerPlugin::tr()

Change-Id: I7ed973ea71b3492e91b45784595d9471587f72ea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-04-24 17:07:29 +02:00
hjk
b77cdaf75e debugger: fix indentation 
Change-Id: I361525533adac8866871c4f5463620fc0f55a97c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-04-24 16:56:28 +02:00
hjk
c5acc63275 debugger: autotest compile fix 
Change-Id: Ib2c0284c559c2060d21193a2b0f4fb63ed036acc
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-04-24 16:44:04 +02:00
Tobias Hunger
9e15264544 Whitespace fixes 
Change-Id: I5e9213a3cc39417d4585ae52a30d1aec450b5579
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-24 15:59:03 +02:00
Kai Koehne
84cb289ae3 QmlJS: Remove 'qmljsprivateapi.h' header 
That's a reminiscent of the times when qmljs was just a copy
of the classes in Qt.

Rather include the files individually.

Change-Id: I6ff8541c004ef4dab9d9d4f5011ff6c5a3a0574a
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2012-04-24 15:46:18 +02:00
Jan Kerekes
98c926f7e5 Added new test cases/suite for QML support 
initial commit

Change-Id: Ifff6a8f9f6b74e099a906fafeb7db2c74aa3bc6f
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-04-24 15:36:17 +02:00
Robert Loehning
9283d7d50f Compile fix 
Change-Id: Ic323f2fc1274128edf367305f690807eea73e366
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-24 14:21:24 +02:00
Robert Loehning
9ad3362f64 Compile fix 
Change-Id: I1749a2a790a7cf41845542cfca9b135d9ad93652
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-24 14:20:58 +02:00
Daniel Teske
1dc89a6c55 Android pluginspec: Fix the last commit, add a missing " 
Change-Id: I3e9da968b5e657c5ceb22dd40aa185accf11c656
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-24 13:57:24 +02:00
Bill King
8182939315 Get tests compiling again on windows. 
Change-Id: I8590aae7b12dbf38156c60e04e3b45a5a9552f48
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-24 13:51:37 +02:00
Daniel Teske
ab96b85176 Mark Android plugin as experimental 
That disables it by default, pass ANDROID_ENABLE to qmake -r to change the
default. The plugin is always built, thus it can be enabled/disabled in the
settings.

Change-Id: I29894f0fe1672a1920b43d38999717ce8b48868f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-04-24 13:46:31 +02:00
hjk
6aaed915e4 android: compile with namespaces 
Change-Id: I964b0bb567bbc45eb5e68e1a7cc892c0757d4ffd
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-24 13:21:35 +02:00
Aurindam Jana
027d5f21d9 DeclarativeEngineDebugClient: Use CamelCase 
Change-Id: Ibf3c8b1e166f6ac16ac3ecd74dd8034678676a31
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2012-04-24 12:34:14 +02:00
BogDan Vatra
50e8f7bb7b Android plugin 
Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-04-24 12:25:40 +02:00
Fawzi Mohamed
cf4ecad4bc zeroconf: quick startup if the embedded daemon is running 
test if the embedded lib works before avahi, to avoid slow
startup on repeated startups when the avahi lib is present
but the daemon does not work.

Change-Id: I5c07ed3513c51065b2cb164e6131b7b85236acfd
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2012-04-24 11:43:24 +02:00
Tobias Hunger
56908de4d5 Make mytasks script take a origin to diff against 
Change-Id: I8640b0852e96b21518fde36d0e0eb24ae473b6f9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-24 10:16:09 +02:00