Commit Graph

43591 Commits

Author SHA1 Message Date
hjk
40edcd0813 FakeVim: (Un)escape special chars in replacements
Task-number: QTCREATORBUG-15512
Change-Id: Idd625a1ea400e4d2dcae314ddd1a77551c6bb787
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-12-16 11:41:25 +00:00
Orgad Shaneh
15eadbe555 SettingsDB: Use APIs for begin/end transaction
Change-Id: I6d45e143a15922b0206ac45bb4c751b5096a2935
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-12-16 10:29:43 +00:00
Nikolai Kosjar
53eaff292e Clang: Remove Mac specific code
Change-Id: I7e146f75e16880e0cfcff81ff15db795a31116b9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-12-16 10:20:27 +00:00
Lorenz Haas
8636b09095 Beautifier: Add fallback for uncrustify's "Format Selected Text"
If the current editor has no text selection and the new option
("formatEntireFileFallback") is selected, the entire file is formatted.

With this change uncrustify's "Format Selected Text" behaves like
ClangFormat which already has a "formatEntireFileFallback" option.

Change-Id: I625efef9b81631ff0ae3ffe2fcb0152c778eb7a2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-15 18:07:26 +00:00
Alessandro Portale
c546a67537 Updated Mode icons
Fresh icons from Diana.

Change-Id: I57f69b2f54474a32404020a50f15cd033664faa9
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-12-15 12:54:04 +00:00
hjk
caf3623ef2 Core: Make enough room in an Id to store a pointer directly.
This switches internal storage from an (signed) int to an quintptr,
making it possible for client code to use Ids directly based on
pointers using Id::fromUniqueIdentifier().

Ids generated by existing code will keep using the low 32 bits only
for now, so the change effectively only affects 64 bit systems.

The patch also moves the rarely used fromUniqueIdentifier code
path out-of-line and replaces the Id::IdsPerPlugin and
Id::ReservedPlugins enums in the only place where they have been
used (setting a lower limit for ids). The limit itself not really
useful, but unchanged by this patch.

Change-Id: Ieabc7d9d72f3c5dd749fb49b7193a0c8629c186e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-12-15 12:00:24 +00:00
Eike Ziller
5a4e6e17e1 Merge "Merge remote-tracking branch 'origin/3.6'" 2015-12-15 11:34:42 +00:00
Ulf Hermann
aeaddda37d QML Inspector: Don't misinterpret objects with ID 0
The invalid ID is -1 and we shouldn't send 0 to the engine debug
service by default as that will select some random object as context
for expression evaluation.

Change-Id: Ide245468f787cc449ff50ac846c7ff31620c01b4
Task-number: QTCREATORBUG-14931
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-12-15 11:34:04 +00:00
Eike Ziller
ff60bf37c9 Merge remote-tracking branch 'origin/3.6'
Change-Id: I8223551aec66539dd8c55262e5000c1621410334
2015-12-15 12:21:58 +01:00
hjk
75cfa50771 Debugger: Move aspect data into separate structure
For easier copying to DebuggerStartParameter later

Change-Id: I41672af7e8540393a6bf32c6644f6e56020503b4
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-12-15 11:04:56 +00:00
Eike Ziller
e492d63aa3 Version bump
Change-Id: Ie9cfae74f7566a171de5fd281c8b2f7885f5a5b2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-12-15 10:57:45 +00:00
Orgad Shaneh
d7f255bbd7 Debugger: Activate debug mode when loading is done
When Creator is executed with -debug (core or executable) and a project, the
core dump is opened, but the mode is switched to Edit when the project opens,
while the user expects debug mode.

Switch to debug mode when loading is done.

Change-Id: I2a6b18c9ff90605840fc53a6b23dee1e8d4d4e2c
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-12-15 10:54:52 +00:00
Orgad Shaneh
e99aaf23b9 CppEditor: Fix ConvertQt4Connect for different namespace
Change-Id: I152d7cda02bb034bf817eeeb4b467667e1188b2f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-12-15 10:49:49 +00:00
Orgad Shaneh
aa6fb0da41 Changelog: Update credits
Change-Id: I7179f45e3f40d46281ed780c86b06a96adf19e21
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-12-15 10:48:10 +00:00
Nikolai Kosjar
7bb2d833f1 CppTools: Predefine __func__ and friends
...so the built-in parser can handle them.

Change-Id: Iff69638f8939c3c4dced99699a3357dd94b23c71
Task-number: QTCREATORBUG-15431
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-12-15 09:57:28 +00:00
Orgad Shaneh
ebf26ca125 C++: Support negative enum values
Change-Id: I93dac08a62be467918dbc9f72239d34191a81fd6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-12-15 09:45:26 +00:00
Orgad Shaneh
4dd4b180f3 EditorManager: Do not use SettingsDatabase for simple entries
The INI file is easier to read and modify.

Change-Id: I263d1d5578709d1e6dbb0cdd7ecd45aa24f89c86
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-12-15 09:11:00 +00:00
hjk
390c633659 Debugger: Merge qtcreatorcdbext/base64.{h,cpp} into stringutils
There was only one function left and this wasn't related to
base64 anymore.

Change-Id: I071fb383bc3d79b606859cbfc79995dd7345a0a5
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-15 08:55:25 +00:00
hjk
c063ced780 Debugger: Remove base64 encodings in cdb communication
Plain hex is less code.

Change-Id: Ia95f3b9235bcf9919084bd116fe5a9656e4b44d6
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-12-15 08:37:40 +00:00
hjk
d72cb777ec Debugger: Use hex instead of base64 encoding for CDB debuggee output
Simplifies code.

Change-Id: Iaabb4b32f7b351d04b512cc132f990a1061da3b5
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-15 08:04:20 +00:00
Takumi ASAKI
44bb3cb4c3 QmlDesigner: Adding qsTrId() support
Task-number: QTBUG-48850
Change-Id: I16a0612ec29b552a3d46f2563fdc2a043b9dec7e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2015-12-15 00:34:57 +00:00
Alessandro Portale
b242c100cb Qt Quick Designer: Enable HighDPI items in ItemLibrary
Item library icons and the drag pixmap could be avalible as
@2x variants.

Change-Id: Ice2254e769351fe4b715f911b3c14aa61813636c
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-14 14:58:05 +00:00
Tobias Hunger
44958cad22 ModelEditor: Add JsExpander object for wizards
Change-Id: I4350f667e813efa92a303fb89b637e9e914b7d4d
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-14 14:26:40 +00:00
Tobias Hunger
56a9b93a28 JsonWizard: Add option to put evaluated expressions into options
This is necessary to allow for constants that are not re-evaluated all
the time.

Change-Id: I4aec9d71aeae1a25ffa97eac177dd9c6fc6a90ca
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-14 14:26:24 +00:00
Tobias Hunger
480f40c038 JSONWizard: Unify "options" handling
Code was duplicated between the factory of the wizard and the file
generator.

Change-Id: Ied2ba99218a5f06e8a0dce0fbc12f277195de8ad
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-14 14:26:17 +00:00
Tobias Hunger
0f34f9e606 JsonWizard: Allow for HistoryCompleter on lineedits and pathchoosers
Change-Id: I93ebe655e2b3526c566b32c5d62ef915906d32a4
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-14 14:25:48 +00:00
David Schulz
c3f6259829 Debugger: cdbextension compile fix.
Change-Id: I4072ef8ea341ed458ff499c200b8c30760a9362c
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-12-14 11:54:32 +00:00
hjk
db2f271256 Debugger: Consolidate memoryToHex{W,} in CDB helpers
Only one is really needed.

Change-Id: I43eb36336faa1f73a93f685fa60e518ee9225abb
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-14 11:52:42 +00:00
hjk
55c77e4286 Debugger: Use hex instead of base64 encoding
... for transport of memory contents in CDB machinery.

Change-Id: Id29aa2a3008ec7e4fc9494ca9e26c4057f895663
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-14 11:51:48 +00:00
Alessandro Portale
68f61a194b Core: Fix taskbar overlay on Windows
It is now a tinted Utils::Icon

Change-Id: Iee13d205f47acc21f15eb40da19d73b94d1c2c1f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-12 12:11:04 +00:00
Ulf Hermann
b52c2f91f5 QmlDebug: Avoid dangerous interactions with QPacketProtocol
After deleteLater() a QObject does have another chance to send more
signals. So, if we do that with the underlying QIODevice, we should
disconnect it from the debug connection (which then doesn't have a
QPacketProtocol anymore). Also, setting dev to 0 in QPacketProtocol is
an incredibly bad idea, as we never check it for 0. The only reason
this piece of code is never triggered is that we never generate
invalid packets on purpose.

Change-Id: I80e7f494bf55fa1a510b6f0bdd50cf45cae23734
Task-number: QTCREATORBUG-15496
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
v3.6.0
2015-12-11 12:45:01 +00:00
Ulf Hermann
4e6d2a201f Debugger: Don't auto-enable QML debugging if LANG_QMLJS isn't set
Change-Id: Id2734ed9615e6c4035d2eacb5bf57dbb2d5029e4
Task-number: QTCREATORBUG-15490
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-11 12:28:21 +00:00
Tobias Hunger
48270d58a6 SummaryPage: Be more robust wrt. selecting from the combobox
QComboBox::view() is the popup only, so do not use that to query for
the selected value of the combobox.

Task-number: QTCREATORBUG-15454
Change-Id: I1279a1c35e7e6f092d623199203ea50620690304
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2015-12-10 16:31:11 +00:00
hjk
4b93663acd Debugger: Also escape special chars in elided displayed strings
Task-number: QTCREATORBUG-15486
Change-Id: Ie481b9458beb2e5ce1458abbd71d311561f961af
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-12-10 14:49:11 +00:00
Ulf Hermann
2aff7963b4 Don't use qSNaN()
signalling NaNs are generally undesirable as they with trigger a signal
on any further arithmetics operation done to them.

Change-Id: Icebae3d4eb22c8294b11da234a2ba5c7e31b9733
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-12-10 14:12:20 +00:00
Eike Ziller
edc149e355 More change log
Change-Id: I6513698ea22d27db31b510d91b9bc959ebbb4cdb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-12-10 13:52:59 +00:00
Robert Loehning
ba4fa17a67 Squish: Ignore known issue in clang code model
Change-Id: Ie57bf820fc2aa318ecf16cac0a2f4cb2f0ffe43a
Task-number: QTCREATORBUG-15483
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-12-10 13:04:50 +00:00
Robert Loehning
8a650b8c23 Squish: Remove workaround for fixed bug
Change-Id: Id639f455b41e3b96d6867dbeb0b7af5c614cffc7
Task-number: QTCREATORBUG-15457
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-12-10 13:04:17 +00:00
Robert Loehning
b2321e04f1 Squish: Finish update for tst_qml_js_console
Change-Id: I5efd9e93a22beed24e770c2015e7239576be6438
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-12-10 11:37:56 +00:00
Alessandro Portale
b327f1a78c MiniSplitter: Make it actually themable via SplitterColor
The CE_Splitter drawControl code in ManhattanStyle wasn't used. This
patch removes it, changes MiniPliter::onPaint to use the theme color,
and adjusts dark.creatortheme's SplitterColor so that actually nothing
changes visually.

Change-Id: I0b94bd2125fd037c2c21dad195f31d092332db43
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-12-10 11:33:02 +00:00
hjk
d01a5ff2aa Debugger: Speed up display of large static arrays with simple data
This addresses QTCREATORBUG-15426 for the case of well-known simple
types (int, float, ...). Retrieving 1 mio ints takes now ~15s instead
of ~140s.

Task-number: QTCREATORBUG-15426
Change-Id: Ifb7c957d60504e23147d499d8bb9bbd41c5a53ba
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-12-10 11:23:24 +00:00
BogDan Vatra
957c0af570 Immediately return the default device if is found
Task-number: QTCREATORBUG-15422
Change-Id: I7be44fbe43c320c171ffb724ffd25414e184fd9a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-10 10:47:31 +00:00
Orgad Shaneh
3baf28e48c Sqlite: Fix warning on MinGW
__thread/__declspec(thread) are compiler-dependent, not platform.

Fix faulty define in the #else branch while at it.

Change-Id: Ic7cc0e2c3bcf79e8f6e952ba92bcbc5f2ba5dccf
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-10 10:33:42 +00:00
Christian Kandeler
255611f3e7 Debugger: Fix qbs build.
Change-Id: I2cad7082821bd43fdb35986b20a00d3ccbb41b62
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-12-10 09:40:26 +00:00
Nikolai Kosjar
421046cb7b Clang: Remove left-over project settings
Change-Id: I45a667c0bdd767697766ebe82b65b61253c77f56
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-09 17:33:12 +00:00
Ulf Hermann
d3d616ea77 qmake: Don't generate profile build configurations for Qt4
In Qt4 the force_debug_info flag doesn't work, so we won't actually get
a profile build, but only a regular release build.

Change-Id: Ie8c31f882b393e35eb525dd12392354ecbbaee75
Task-number: QTCREATORBUG-15457
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-09 15:42:42 +00:00
Orgad Shaneh
d4d0b889a0 Debugger: Completely ignore *running message on Windows
They appear with each newly created thread, which makes them unreliable during
startup, and useless later.

On startup, we issue -exec-continue and expect running. But unrelated *running
messages appear, and the state is changed to RunOk, although exec-continue is
not done yet. This results in "UNEXPECTED STATE" error logs.

Trust only response ^running.

Change-Id: I5e75fcd19928dab83d83ca71e9497021766460e9
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-12-09 15:41:59 +00:00
Orgad Shaneh
cbd6985693 Debugger: Consider reason-less stop on Windows as terminal sigtrap
Task-number: QTCREATORBUG-14350
Change-Id: I1d7af5f9c91cfbe43127e06d0bb7faddded4ccf6
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-12-09 15:40:56 +00:00
Tobias Hunger
f6683332a6 Fix configureAsExample
My last commit broke that.

Change-Id: Ib601965120d13abdea4007158f1a6829a72c6690
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-09 15:25:40 +00:00
Eike Ziller
250798ed92 Fix visibility of floating debug windows
When auto-switching the mode back to the previous mode
after debugging finishes, floating debug windows
were in a funny state, if at the same time Qt Creator
was (re-)activated as the previous application by the
window manager. Work around that by doing the switch
asynchronously.

Task-number: QTCREATORBUG-14689
Change-Id: Iec1246854843f523b29003b1997466926ea02402
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-12-09 14:57:48 +00:00