summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Qbs: Do not log info level eventswip/qbsTobias Hunger2013-01-241-0/+1
| | | | Change-Id: Ia368e429d089753d35fa103b9068d5e21bec75ad
* Qbs: Support building of single filesTobias Hunger2013-01-248-0/+71
| | | | Change-Id: I6c20fcf0bf7b15361a51917774b8847c6fcd7d98
* Qbs: Reuse ProjectNodesTobias Hunger2013-01-244-89/+278
| | | | | | This preserves state of the Projects view Change-Id: I335ed3abf58c811cd44531f91f74a911b139decb
* Qbs: Fix build after recent updatesTobias Hunger2013-01-244-9/+16
| | | | Change-Id: Ieaa57dc1cf0ea60ed612caf10f8e8aa06e70a9ba
* Qbs: Fix possible crash when reparsing the projectTobias Hunger2013-01-242-4/+20
| | | | Change-Id: I61a1ca5745639681e3dda879414dfeca9101f64c
* Allow for disabled nodes in Projects viewTobias Hunger2013-01-242-1/+16
| | | | Change-Id: If1413ea0a19384e69f56e861c3c7f7d001cc6495
* Qbs: Adjust to recent change in profile handlingTobias Hunger2013-01-241-1/+1
| | | | Change-Id: I20783a233ecfcc3b7e9fa3db1a111629eb24e01b
* Qbs: Fix build on windowsTobias Hunger2013-01-242-1/+7
| | | | Change-Id: I7302f24a8ed30eed2febd7ec0ab7b4e218dc5aad
* Qbs: Build with QT_NO_CAST_FROM_ASCIITobias Hunger2013-01-241-1/+1
| | | | Change-Id: I174d7ee7b94f5d8b249a980932300d015a3f9364
* Qbs: Make canceling a build workTobias Hunger2013-01-242-5/+8
| | | | Change-Id: Iea0b964d8db9b563d387315cc6469b0b3ae322a1
* Qbs: Set displayName on buildstepsTobias Hunger2013-01-242-2/+6
| | | | Change-Id: Ifd8d79fc60c0ecd5adb5564d3c60826dfc55f01e
* Remove debug codeTobias Hunger2013-01-248-86/+0
| | | | Change-Id: I43a8b56dceaf57014222f1940f5d5a0a608f43a0
* Fix possible crashTobias Hunger2013-01-241-0/+3
| | | | Change-Id: Ifbf80524995437c0d1d939e4dac6aa384cef31f9
* Set Qt Creator environment to qbsTobias Hunger2013-01-241-1/+9
| | | | Change-Id: I0fff11b621bc4a85d774dcf8b1538286a78ff40a
* Use environment variables to look up qbs.Christian Kandeler2013-01-241-0/+5
| | | | | | | | Otherwise most people would have to edit the project file or move their sources and builds around. Change-Id: I9896b983369678921d45657655468711e4c80e73 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Initial version of qbs pluginTobias Hunger2013-01-2446-17/+4672
| | | | Change-Id: I9c995247d35f291496ffde5bf42522ac6a6f3609
* Allow for disabled nodes in Projects viewTobias Hunger2013-01-241-0/+2
| | | | Change-Id: I8b9a2666c8efdc5981adfe6a3a032884a6e50d2a
* Android: Make local deployment smartDaniel Teske2013-01-245-34/+223
| | | | | | | | | | | | On deploying, first check the timestamps of the files on the device, and then only copy+strip+deploy the files that are newer. Add a button for cleaning /data/local/tmp/qt as that is no longer done on each deployment. Task-number: QTCREATORBUG-8538 Change-Id: I93c4e6266d7d748b0a4735e00806282315227d4b Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* qmljs/parser: update to latest qt5 parserFawzi Mohamed2013-01-2414-1001/+1381
| | | | | | | | fix error semicolon insertion of loops, strict mode Change-Id: Ic67d6b1fff6f476ea7eb64ae0ee43515d29654a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppTools: Fix qbs buildOrgad Shaneh2013-01-241-2/+1
| | | | | | | Global include is wrong Change-Id: I34848ba4b92cfa047854abd476ed983f205bdf72 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Gerrit: Use GitClient functions for checkout and cherry-pickOrgad Shaneh2013-01-241-32/+14
| | | | | | | This is cleaner, and for cherry-pick also handles conflicts Change-Id: I50a7035c532a2cfa07fdd960e70ffb4af666a80e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Git: Remove "Branch" from synchronousCheckoutBranchOrgad Shaneh2013-01-244-8/+8
| | | | | | | Other refs can also be checked out using this function Change-Id: I80a1c15244b1043cfce650a121c71174b9d322cb Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ProcessStep: Remove unused ctorDaniel Teske2013-01-242-7/+0
| | | | | | | | It was probably meant for deriving from ProcessStep. Noone does that, and AbstractProcessStep would be a better base class anyway. Change-Id: I95374677c00a502f2ece4eaa71f7f9a8df2ecf2d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Adapt qbs project files to new installation approach.Christian Kandeler2013-01-2413-139/+76
| | | | | | | This need a qbs build >= commit 5cdf94de to work properly. Change-Id: If86aedf9e3f9d01ad1202e03221e49698d517666 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Plugin tests: code cosmeticsNikolai Kosjar2013-01-241-5/+6
| | | | | Change-Id: I789dac25d978535457e62702ce3fc9912cf7282f Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Plugin tests: Allow to specify which test functions to runNikolai Kosjar2013-01-243-14/+84
| | | | | | | | | | | | | | | | | | This simplifies debugging single test functions. Test data can be specified the same way as for QTest executables. New syntax for the -test option: -test <plugin> [testfunction[:testdata]]... Examples: ./qtcreator -test Git testDiffFileResolving ./qtcreator -test Git testDiffFileResolving testStatusParsing:"DU" Change-Id: Ifea6b114bfc0fabe3e9ddffcc2fd90af157052ec Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Git: Remove unused functionsOrgad Shaneh2013-01-242-24/+0
| | | | | Change-Id: I6cb9752f435255379cf7a8a321b3192a410d91df Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Use StashGuard for merge and rebaseOrgad Shaneh2013-01-243-19/+9
| | | | | | Change-Id: I7c9059396aaac78c769518b34c7bf68bfe9932ec Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* Git: Introduce StashGuardOrgad Shaneh2013-01-248-84/+100
| | | | | | | | | Offers the user to stash changes (if relevant), stores the results and pops the stash when it goes out of scope (unless disabled) Change-Id: Ibc0d2a5d3e3c953062fb17ecba903ca814524837 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Explicitly pop stored stashesOrgad Shaneh2013-01-243-5/+13
| | | | | | | | | If the user created another stashed between save and pop, this stash will be restored instead of the intended one. Change-Id: I605c9f440345d8c7e0876f4f60daa7146bebb212 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Debugger: move MI decoding to debuggerprotocol.{h,cpp}hjk2013-01-245-194/+199
| | | | | Change-Id: I9d2eaf43b66f0db74ba2584157d6df8280d76652 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix AndroidRunner stop action.BogDan Vatra2013-01-242-6/+0
| | | | | | | When the stop button was pressed nothing happened Change-Id: I58a05aa3a4ea990595298cde0a330b382b65b035 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Android: also adb pull /system/bin/linkerRay Donnelly2013-01-241-0/+4
| | | | | | | | | | | | | | | | | This is so that gdb can find the address of rtld_db_dlactivity to enable breakpoints pending on shared libraries to be set. Several fixes were needed so this can be used both in Jellybean as well as older versions of Android. Credit for these improvements goes to Ryan Bissell: https://android-review.googlesource.com/#/c/39180/ https://android-review.googlesource.com/#/c/42611/ https://android-review.googlesource.com/#/c/42612/ Change-Id: Ibfb6335ab256df58b407e1661e1f04070fc3ecb6 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* C++: Add Quickfix for fixing pointer types/declarationsNikolai Kosjar2013-01-241-12/+94
| | | | | | | Task-number: QTCREATORBUG-6169 Change-Id: I718dc071b1904d5cbf575c8f379e5ed08522d51f Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* C++: Add settings dialog for pointer declaration formattingNikolai Kosjar2013-01-247-30/+308
| | | | | | | | | | | | | | | | | | | | | | The dialog is at Tools > Options > C++ > Code Style > Edit... > Pointers and References. Currently the settings are referenced when applying the following QuickFixes: - Adapting function signature in declaration/definition (FunctionDeclDefLink) - Inserting declaration from definition (InsertDeclOperation) - Inserting definition from declaration (InsertDefOperation) - Extracting a function (ExtractFunctionOperation) - Add Local Declaration (AddLocalDeclarationOp::Operation) In these cases the code style of the current project is used. If there is no current project open, the current global code style is used. Task-number: QTCREATORBUG-6169 Change-Id: I3e4e502b3103f7f754ac9b39594ad461d89d9304 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* C++: Introduce PointerDeclarationFormatterNikolai Kosjar2013-01-2410-9/+1146
| | | | | | | | | | | For a given AST, CppRefactoringFile and Overview this will create a ChangeSet for rewriting the pointer or reference declaration according to the Overview. Task-number: QTCREATORBUG-6169 Change-Id: If6f824c1ea5e9f53a11a58ec8b6d696d01f0723e Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* C++: test for walking includes in frameworks.Erik Verbruggen2013-01-2414-0/+101
| | | | | | Change-Id: Id31ce6b40d72351cfaefa5035469b87662526853 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* InfoBar: Suppress warning on closeOrgad Shaneh2013-01-241-1/+1
| | | | | Change-Id: Ie8c19db3e7569c20c1f8d5c6651f1b9b0f7db9dd Reviewed-by: hjk <hjk121@nokiamail.com>
* Editor: Added documentation and comments to BaseTextDocument::save.David Schulz2013-01-241-0/+8
| | | | | Change-Id: Ia1ccf30209ca2e802268afea6bc1dfeed421007d Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Debugger: rename gdb/gdbmi.{h,cpp} into debuggerprotocol.{h,cpp}hjk2013-01-2423-50/+47
| | | | | | | The scope is a bit broader nowadays. Change-Id: I9578da94f06df199be5668c1751fd7bfb37f1c5b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* AbstractProcessStep: Remove pure virtual function declarationsDaniel Teske2013-01-241-3/+0
| | | | | | | | Those don't add anything since those functions are already virtual in BuildStep. Also immutable() is not pure in BuildStep. Change-Id: I068e703de444581ac4c053fed6f1793bddcd56e3 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* VCSBaseEditor: Make diffFileBrowse more genericOrgad Shaneh2013-01-242-55/+42
| | | | | | | Log entries can also be displayed in this combo box... Change-Id: Ibd75f436013f58d18963a675ce01a20385cc7dfd Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* AbstractRemoteLinuxDeployService: Remove unecessary checksDaniel Teske2013-01-241-8/+0
| | | | | Change-Id: I769a2f514843a3825d3d5a2f8a61b9e9f5f9f537 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* QMakeParser: save one ByteArray constructionhjk2013-01-241-1/+1
| | | | | Change-Id: I2845fdefb8b32de227f08017e0e3ad98923d1c87 Reviewed-by: hjk <hjk121@nokiamail.com>
* TarPackageCreationStep: Use static_cast not qobject_castDaniel Teske2013-01-241-1/+1
| | | | | Change-Id: Ief5a5835eb43a7e24db04315166fc3723b9ed997 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix compilation with Qt 5.Friedemann Kleint2013-01-241-6/+8
| | | | | | | Q_GLOBAL_STATIC_WITH_INITIALIZER was removed. Change-Id: Ie030f2fa66c97ae1bfd8ede95c573453a7f03d2a Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Git: Add context-menu actions for cherry-pick and revertOrgad Shaneh2013-01-235-1/+36
| | | | | Change-Id: Ic266fe039423a37df2fc347ead7530322ac47bb8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Add a space after "Error:" in tooltipKai Koehne2013-01-231-2/+2
| | | | | Change-Id: I0ecefcedf49175abee7a71ddce9ce9630b989a17 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Options Dialog: Move Android, Blackberry and Devices togetherTobias Hunger2013-01-234-4/+4
| | | | | Change-Id: Ie91735bc4f9d0c6b84ff7347538906290473e07e Reviewed-by: hjk <hjk121@nokiamail.com>
* Git: Fix calls to ensureStashOrgad Shaneh2013-01-232-2/+2
| | | | | Change-Id: I581afbe314055796d22f883e501dfb5fd17117fe Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
View Lorry Controller Status