Commit Graph

26835 Commits

Author SHA1 Message Date
Fawzi Mohamed 66eb27e687 qmljs: indent expression in if condition and indent lambda expressions
* indent expressions (like function defs) in if condition
  fixes QTCREATORBUG-7243

Change-Id: I61197317a8dcba72a45b660600711748e2e2b962
Reviewed-by: Christian Kamm <kamm@incasoftware.de>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-12-03 13:41:22 +01:00
Orgad Shaneh 9bf654743e QmlJSEditor: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I899c26e028efe355d4673b55ac9718e103c7d7ec
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2012-12-03 13:40:51 +01:00
Sergey Shambir f5064d064f Replaced incorrect call of predefinedMacros() with field copying
Change-Id: I826951ea9156fe67743e7b68fc08b5192baaad3f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-12-03 11:40:23 +01:00
Orgad Shaneh 1f0f5eabb5 QmlEditorWidgets: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I84ed6dca71621a4e790f5aff0ad25339fb9e8772
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2012-12-03 11:38:41 +01:00
Orgad Shaneh 71ce993cdb LanguageUtils: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I94f3825f586efc052e027fdc0d974e66d190ed57
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-12-03 09:12:42 +01:00
Orgad Shaneh adfb07d049 Aggregation: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: Id2e6edb66dbc6afb3647ff94af08fb9246f11b08
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-12-03 09:11:39 +01:00
Orgad Shaneh ac9c649bef QmlDebug: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I58dfa1575ff9a64325281e66418a3b5c2c1b81ee
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2012-12-02 21:53:39 +01:00
Eike Ziller d719eebfdc Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/coreplugin/editormanager/openeditorsview.cpp
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/debugger/qml/qmlinspectoradapter.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/exampleslistmodel.h
	src/plugins/welcome/welcomeplugin.cpp

Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
2012-11-30 17:02:35 +01:00
Eike Ziller de4fd54c76 Fix that locator file filter couldn't open directories ending in + or :
There basically just no sense for directories to have line number
suffixes, so we just remove that part.

Task-number: QTCREATORBUG-8272
Change-Id: Ia103ed15cd7ab00fb2d5bb692423e8542722fa31
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-11-30 16:17:55 +01:00
Kai Koehne c6e47403c4 Fix chinese translation file
Got broken in cb18283dd8.

Change-Id: I402f2efa711b6dc42d5d6363b07a98560c942e33
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-30 15:43:01 +01:00
Lukas Holecek 61c3de01a8 fakevim: Commands '[z' and ']z' to move to top or bottom of fold
Commands '[z' and ']z' to move [count] times to top or bottom of current
folds.

Change-Id: Ia087e47bd5f9d63a2b9a4b2ffd3fc57559dfba6b
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-30 14:34:43 +01:00
Lukas Holecek 9d2f1f6769 fakevim: Commands 'zj' and 'zk' to move [count] folds down and up
It's possible to do '2dzj' to delete everything up to beginning of
second unfolded block or whole folded block.

Change-Id: I080c9ec4d12471faf09cabea3c96b448b5fc7f4d
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-30 14:33:44 +01:00
Tobias Hunger 1b1c008a37 Fix warning
Fix warning about values not being covered in switch statement

Change-Id: I9c2fed95b5fb9ee2e2ee344a8ca4524e26bcaf8a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-30 14:26:24 +01:00
Orgad Shaneh f782f9b901 Git: Cache findGitDirForRepository results
Change-Id: Ia22ec20d3934dbdfa42461f66230b62bf6c1df07
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-30 13:41:23 +01:00
Orgad Shaneh 1712b86e0e Git: Remove description from PanelInfo
It is not used anywhere

Change-Id: I9884c4c015bc14cb78e35950c7544c8d004a73ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-30 13:25:18 +01:00
Orgad Shaneh 25981d918e Git: Support alternative topics on detached HEAD
Use tag if applicable, otherwise use HEAD hash

Change-Id: I5c7298446e5a325a27d6d9b5effc02d32155b583
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-30 13:25:02 +01:00
Orgad Shaneh 5ec925f7e7 Git: Cache synchronousTopic results
Refresh when HEAD timestamp changes

Change-Id: Ibb365d03074dabb700a55b96a924e31fed26c6ab
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-30 13:24:56 +01:00
Orgad Shaneh 6a58cdffc2 Git: Rename synchronousBranch -> synchronousTopic
Change-Id: I272e9db7a560f6e72dda6a0368d463da820f5b0b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-30 13:24:49 +01:00
kh1 164b45c82e Make sure we register Creator with a proper ProgId.
Depends on: https://codereview.qt-project.org/#change,38650

Change-Id: Idbd91ec7873286fe4a371c6c9dcebddece4acf45
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-11-30 13:09:20 +01:00
Eike Ziller 2118d542e6 Allow external windows to define contexts for Qt Creator.
Task-number: QTCREATORBUG-5070

Change-Id: Ia466b73eb37bb8aef6f71ab8f1d990b40b43cac3
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-30 12:16:31 +01:00
Orgad Shaneh 6a337561c5 Git: Show Precedes/Follows tags on Show editor
Known limitation: Commit that has a tag shows its own tag on Precedes
field

Change-Id: I533e48b4bb5d57809d8e9f12fa7db5d8706f7372
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-30 12:03:43 +01:00
Jing Bai cb18283dd8 update the Simplified Chinese translation file
Change-Id: I39b8284f77eb0420e63e752d7dd8881d24133d09
Reviewed-by: Liang Qi <liang.qi@digia.com>
2012-11-30 11:44:11 +01:00
Orgad Shaneh 7127b38a1a ClearCase: Cache ccGetView
Used in vcsTopic, should avoid executing external tools as much as possible

Change-Id: I8100f50fb695cb0a8df7b09b99bdb90e029ad44a
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-30 11:15:08 +01:00
Orgad Shaneh 17a73005fc Git: Fix findGitDirForRepository
Returned directory is relative

Change-Id: I13c9812825cfe57e880c21ad94178b5e9135b8e9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-30 11:07:28 +01:00
Orgad Shaneh ac229fd317 TaskList: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I63b440e0c59bb7bfa2c4fec5877dc873c09344ab
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-30 11:07:02 +01:00
Orgad Shaneh 5df4732f35 ClearCase: Refactor ccGetView()
Change-Id: Ia3caa47a701fd58c07f9f463bb282cf0be3807ae
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-30 11:04:33 +01:00
Eike Ziller 0d5593e8ce Deploy Qt 5 printsupport plugins on Lin/Win
Task-number: QTCREATORBUG-8297
Change-Id: Ie19534c669a1160a0acce8a037016b1f3007cb6b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-11-30 10:45:28 +01:00
Lukas Holecek 00a10fcfa8 fakevim: Correct undo/redo position for changing numbers
Restore position on undo and redo after <C-A> and <C-X> commands.

Do not set dot command if no number was found.

Change-Id: Ia4e6d53ecfbd7f56e874d6a39c0939557f6cdc3d
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-29 22:44:43 +01:00
Orgad Shaneh fa986939ba ClearCase: Unmark as experimental
Change-Id: I32526476c116cda87aaf51551948bd2d0c667180
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-29 21:10:10 +01:00
Jing Bai 54af477e65 keep default kit status in apply()
m_isDefaultKit is changed to wrong value during apply() process,we need
to keep the value so that the rest of the logic works correctly.

Task-number:QTCREATORBUG-8205
Change-Id: Id25e56273ed06957d0a26d893ec26b9bf73864fa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-29 21:08:35 +01:00
Lukas Holecek 5919416eab fakevim: Increase/decrease octal and hexadecimal numbers
Hexadecimal (prefix '0x' or '0X') and octal (prefix '0') numbers are
unsigned. Decimal number can be signed (with leading '-').

Preserve width of hexadecimal and octal numbers (i.e. append leading
zeroes if result is shorter or remove leading zeroes if any and result
is longer).

Change-Id: I93769546ff40a586458986909fcee1e4e9143bc2
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-29 16:53:44 +01:00
Daniel Teske e3289b6527 QmlProject: Avoid crashes on adding actual process steps to deploy list
Change-Id: I3bb45142a17971d21bd7e840ee0397bd49ed4469
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-29 15:59:00 +01:00
Robert Loehning a9750d0226 Fix opening in file manager
Task-number: QTCREATORBUG-8174
Change-Id: I9858ff5c24e80ed1f4375b2f4076bc74832bb217
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-29 13:43:56 +01:00
Tobias Hunger dccb63b406 Kits: Do not allow kits with empty names
Change-Id: Id30080cebd7aeb0917516d7d94200f90bd531397
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-11-29 13:07:29 +01:00
Tobias Hunger 0e7cb4b1c6 Kits: Do not construct kits with names starting with -
Those look ugly.

Change-Id: I984060aaddf3294edf748a4c5c167efba7e40da8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-11-29 13:07:23 +01:00
Eike Ziller 97b9c0ce56 Fix build with Qt4
broke with 6e432b9d4e99ca233fb687be142b8782342f41d7

Change-Id: I67bda87a4fd0f9e0c2305843ae732b3bb66bf0c8
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2012-11-29 12:38:44 +01:00
Aurindam Jana f3456c8f92 Fix build for Qt 5 configured without -developer-build
This patch reverts 2b0c1fb376 and
affd4b9ce1

Change-Id: I65daf80a0e510f4103c2f2714a3ee583207e53d0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-29 12:31:34 +01:00
Thomas Hartmann 3818efae03 QmlDesigner.PropertyEditor: normalize applicationDirPath()
This is needed on Windows for QML since QML always
checks for capitalization.

Task-number: QTCREATORBUG-6126
Task-number: QTBUG-28230
Change-Id: I011464288f6052bfe19452b8ce555d6c462e15dd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-29 12:17:28 +01:00
Morten Johan Sørvig a3f35a447a Set styleObject on the QStyleItem style option.
Qt now generally expects styleObject to be set
during style draw calls.

Change-Id: I148d0a4e95a60c35fc6dc2b34cd0ba8d598cf7c3
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-29 11:30:08 +01:00
Marcel Krems 297afe3b01 Copy plugins to correct user directory under Unix.
Change-Id: I587154926a5e4bce62984445d7a00547c0b51673
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-29 10:45:58 +01:00
Lukas Holecek ec3f4d3801 fakevim: Handle completion in insert and replace modes
Text inserted without FakeVim's intervention (code completion) is
handled in insert and replace mode so that '.' command also inserts any
externally inserted text.

After movement in insert mode last command (initiated by '.') is not
cleared until new text is inserted.

Deletion in insert mode is part of dot command.

Change-Id: Ic55b3cdecaf4323e88cd321b218fae661de7a63e
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-29 10:40:04 +01:00
Kai Koehne 50c3e774bb WelcomeScreen: Show content even for incorrectly capitalized application dir
Work around QTBUG-17529 by normalizing paths first.

Task-number: QTCREATORBUG-6126
Task-number: QTBUG-28230
Change-Id: Ib7a52c81cf546d022b9db8402e225c8d3c10c0ca
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-29 10:38:28 +01:00
Aurindam Jana 2b0c1fb376 Fix build for Qt 5
QAbstractFileEngine is in a private header in Qt 5

Change-Id: I2f3317e48274392cda853ebf69ed96a662763094
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-29 10:16:26 +01:00
Orgad Shaneh cd6302502b QmlJS: Revert CodeFormatter::stateToString return type to QString
Change-Id: I532327126dfdbe4d338d7afd0bcbe5e27ba206d9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2012-11-28 23:18:42 +01:00
Christian Stenger 18e0363c71 Squish: Remove unnecessary calls to clean up
Change-Id: I981392e5ef3397c3b80f1031e0644f84de1445f2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-11-28 21:11:05 +01:00
Orgad Shaneh a44aa55502 Add whitespace after control keywords
find -name \*.cpp -o -name \*.h | \
  xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g'

Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-28 20:20:46 +01:00
Orgad Shaneh 3747e941ad Clean up whitespace before EOL
Change-Id: I385544a10b9be66589b0d1a48594128035836c8a
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-28 20:17:51 +01:00
Daniel Teske 50417fd92a CMakeBuildConfiguration: Remove unecessary virtual
It's the coding style and this makes it consistent in this file

Change-Id: I6d99651eea2ffc161ecf3efc50a1ed71eaf67aa0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-28 17:40:27 +01:00
Kai Koehne fa63059cbd Deployqt: Add qt.conf
Override any QtLibraryInfo settings.

Change-Id: Ib931d132975769a2ab90f832b672bc6740138841
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-28 15:42:15 +01:00
Tasuku Suzuki a7f9456a4e add QDir::NoDot and remove dir != QLatin1String(".")
Change-Id: I2008d873862233262bdb483cd3a8aba64ddaa453
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-28 15:35:30 +01:00