feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
32,876 Commits 108 Branches 368 Tags
efa1d47650219fdcef4a174f2cb1074c90b88c07
Commit Graph

101 Commits

Author SHA1 Message Date
David Schulz 769c5d41e5 CdbExt: Fix dump of QDateTime after latest 5.2 changes. 
Change-Id: I0a64539405792b0c839230400b80699c3470dee0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-11-13 09:22:23 +01:00
David Schulz fe8110ed6f CdbExt: Workaround GetTypeSize issue... 
... for QString and QByteArray.

Task-number: QTCREATORBUG-10679

Change-Id: Id07cad2715560f772374c1b4bcf3291338908f30
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-11-11 07:28:50 +01:00
David Schulz 4a90a821f3 CdbExt: Fix dump of QFileInfo. 
Change-Id: Idef887bdf782c1e22a712f069b0657e033217ebf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-11-08 13:53:49 +01:00
David Schulz ec24614f2c CdbExt: Fix dump of QString when array size equals full size. 
Task-number: QTCREATORBUG-10679

Change-Id: I594e52297cd65b15eabb5a5f29363c925708f00b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-11-07 15:17:58 +01:00
Robert Loehning c61610b259 debugger: Avoid NULL-pointer deref 
Change-Id: I25e25ea801c857b7995029bba3963d7d9d73827a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-10-10 16:57:01 +02:00
Orgad Shaneh 977a70b3ea Fix MSVC compilation 
symbolgroupnode.obj👎 error: LNK2019: unresolved external symbol
"char const * const stdWStringWCharTypeC" (?stdWStringWCharTypeC@@3PBDB)
referenced in function "public: static class std::map<class std::basic_string
<char,struct std::char_traits<char>,class std::allocator<char> >,int,
struct std::less<class std::basic_string<char,struct std::char_traits<char>,
class std::allocator<char> > >,class std::allocator<struct std::pair<class std::basic_string
<char,struct std::char_traits<char>,class std::allocator<char> > const ,int> > >
__cdecl DumpParameters::decodeFormatArgument(class std::basic_string<char,struct std::char_traits<char>,
class std::allocator<char> > const &,bool)"
(?decodeFormatArgument@DumpParameters@@SA?AV?$map@V?$basic_string@DU?$char_traits@D@std@@V?$
allocator@D@2@@std@@HU?$less@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$
allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@std@@@2@@
std@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@_N@Z)

Change-Id: I64b1bc2b07df5da199a14c743f919fca4c0c22b3
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-09-30 08:46:17 +02:00
hjk f17d9f01dc Use the canonical version of defining string literals 
Change-Id: If36658de6f68f552f93830ba4f1cfa9994a2e44c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-27 14:36:10 +02:00
Leena Miettinen 5358ffe903 Doc: edit qtcreatorcdbext docs 
Fix capitalization, use standard wording, and
fix some QDoc commands.

Change-Id: Ic2e6cfd43b9aa24d69b2703334c3dc6fb2331299
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-09 12:54:40 +02:00
Leena Miettinen 41411165ba Doc: use standard wording in \brief commands 
QDoc does some magic with the \class and \namespaces
and \brief commands, so the following wording must be used:
"The xxx class yyy ..."

Change-Id: Id231f30e8464898b776888d5423523de404aae34
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-06-20 11:22:47 +02:00
Robert Loehning 573be98843 Added note about apparent memory leak 
Change-Id: I1772548f574144141c29540e1573ce60c657b9f6
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-05-17 14:56:31 +02:00
David Schulz fc00973985 cdbext: Fix dump of QString inside QVariant. 
Change-Id: I137f92c6ff744e15efe3d24cbf28206b62a30d5e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-04-22 12:22:28 +02:00
David Schulz 788286068e cdbext: Add QPixmap to the QVariant dumper. 
Change-Id: Ia1d6b845180239c0d0d3ccfcd7360d16e463cd96
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-04-22 12:12:15 +02:00
David Schulz b782d191cf cdbext: Add dumper for QPixmap. 
Change-Id: Ib3935ed8ea03500e5787dcfdf9828f18539ffc93
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-04-22 10:03:47 +02:00
David Schulz 38531a781e cdbext: Adjusted dump of QChar 
... to be consistent with gdb.

Change-Id: I0bfbf9b14ee884acd762434b67cce6794380aac7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-04-15 10:59:30 +02:00
David Schulz c5f7cc62bb cdbext: Dump QHostAddress initialized with uint. 
Change-Id: I1fa9587370d1ab90235cda63192a5908fa53fd4b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-04-09 14:57:19 +02:00
David Schulz fb6969ae5b cdbext: Remove dumping of QImage pointer address. 
Change-Id: I61170c9be1cc3cd49e518dd124d020273a87b610
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-04-09 14:34:21 +02:00
David Schulz aae5f4c8d8 cdbext: Fix dump of QDir. 
Change-Id: I863c45b9c54d39c2e879d9f4f4d080622348e1db
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-04-09 08:25:07 +02:00
David Schulz 0bac4d861d cdbext: Fix dump of QString from QPrivate class 
Change-Id: Id7f1242405acebd8db37369ad3c4fa2442cb80a8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-04-02 09:40:34 +02:00
David Schulz bee3cc3d63 cdbext: Generate values for QDate, QTime, QDateTime 
... in the watchdata via flags.

Change-Id: I4664807713cc7747216de5abaabf30011921ab4c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-03-19 16:29:18 +01:00
David Schulz 8e40e629e7 Debugger: cdbext: Unify QByteArray output. 
Change-Id: Iea2a5f581da28dc393d918a9b428d2cbe44474df
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-03-14 15:12:53 +01:00
Friedemann Kleint 9f5a987f20 Debugger: Fix CDB Dumper for QDateTime. 
QDate is a 64bit in Qt 5, which will be aligned on 64bit borders
in 32bit and 64bit builds.
In Qt 4, it will be aligned on 32bit borders for 64bit builds as
well. Differentiate between padded and non-padded types when
retrieving the address of a QSharedData-member.

Change-Id: I6a16d6aa2dc0d5ad85d3d25f71ce09c06bd04c05
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-02-25 15:45:50 +01:00
Oswald Buddenhagen 1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
 2013-01-31 16:25:33 +01:00
Friedemann Kleint 5a4cd737ba CDB: Use maxStringLength parameter from settings. 
Change-Id: I0969bbbc39863e0981b5af81feced10d0fbbecac
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-01-31 15:49:24 +01:00
Robert Loehning 298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
Friedemann Kleint 23b7dc5b5c CDB: Dump QStringRef. 
Extend QString dumper to be able to dump a substring.

Change-Id: I1f64e441980a7c2c295f40317b2b187cfebcd7ea
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-18 16:49:08 +01:00
Friedemann Kleint f9de22e4bd CDB: Fix dumping of QRect. 
x2, y2 are inner points.

Change-Id: Ibbded22dd35da19894ad3678552519691b62e14f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-01-09 10:03:01 +01:00
Orgad Shaneh 29a93998df Remove braces for single lines of conditions 
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-08 10:48:18 +01:00
Friedemann Kleint 2344456b3f CDB: Support for displaying QImage. 
Change-Id: Ic1a4a0e6767a0cecb1fd869bbcfd9673854631aa
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2012-12-29 20:05:45 +01:00
Friedemann Kleint 99f542354a CDB: Enable "Separate Window" format for standard strings. 
- Always retrieve memory for std::strings.
- Enable type format.

Change-Id: I7bd00adbbeff0c4cc380b3ec078df408440302b4
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2012-12-29 20:05:32 +01:00
Friedemann Kleint 5f04706a88 Implement basics for edit value handling in CDB. 
- Add routine for formatting edit values.
- Optionally store memory in SymbolGroupNode (along
  with special info) to be able to re-use it for
  edit values using a simple convenience class
  MemoryHandle.
- Prototypically implement QString and QByteArray / Qt 5.

Task-number: QTCREATORBUG-8344

Change-Id: I6d2cac7a1e9ac48e94335142c41dc1bfb984c515
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2012-12-21 15:41:39 +01:00
Friedemann Kleint 0a556c2fe1 Adapt Qt symbol resolution to library naming change. 
Change-Id: Iaf3eaf2b98bba6f1796a59499136e92c4124ad0b
Reviewed-by: hjk <qthjk@ovi.com>
 2012-12-14 11:03:31 +01:00
Friedemann Kleint 8c8e7b4cbc CDB: Fix module names in Qt 5. 
Library naming convention was changed.
Increase version.

Change-Id: I01a7e49f6ffb0e4e78c25f9d9e117a2100dc7784
Reviewed-by: hjk <qthjk@ovi.com>
 2012-12-13 11:08:23 +01:00
hjk 386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Friedemann Kleint 2fc6b24a8a CDB: Fix dumping of objectNames() in Qt 5. 
Qt 5 has an additional extraData.

Change-Id: Ieac0a1855ed93b4ef2c0900e37097d89de440895
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-11 11:59:43 +02:00
Friedemann Kleint e9cd29f7a7 CDB: Improve simple dumpers. 
Retrieve data of Qt types with unexported private classes
from memory.

- Dump new string members of Qt 5's QUrl
- Fix QDir (faulty offset).
- Implement QDateTime.

Change-Id: Ie0524a531cd0afb3b8e058c2a0a0bf9616078357
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-24 12:51:59 +02:00
Friedemann Kleint b5abaa27df CDB: Fix STL debugger helpers for MSVC2012 beta. 
In MSVC2012, more bases classes for std::string
and containers were introduced whereas std::pair_base
was removed compared to MSVC2010.

Add a findMember() function to be able to skip base
classes when looking for a certain member to finally
fix this issue.
Introduce SymbolGroupValue::parent()/childCount()
and simplify the helpers using it.

Change-Id: I7a6aad5c07739ca9cbf350489acd6d03bd1865e8
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-02 13:43:28 +02:00
Friedemann Kleint 467a08127d CDB: Output std::wstring with compiler option -Zc:wchar_t-. 
std::wstring is then based on wchar_t instead of ushort.

Change-Id: I4dd3ef29069b8375e7003deba3162537a0d01784
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-01 16:35:13 +02:00
Eike Ziller e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Friedemann Kleint 7e53c4a738 CDB: Improve watch expressions. 
- Fix watch expressions for array to at least point to the
  initial element.
- Return the name (which is the initial expression for the watch
  symbol group) as last resort if the evaluation fails to avoid
  obtaining "(*) 0" as expression.

Task-number: QTCREATORBUG-7408
Change-Id: Ifdf5ba59f6e18527d98b869f6a273aed283bd7da
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-05-29 14:33:59 +02:00
Friedemann Kleint 82170f0050 CDB: Dump Qt 5 / QString correctly. 
Adapt to recent change basing QStringData on QTypedArrayData.

Change-Id: I8145015e31ca10bc484d01e8082a2f97d6750285
Reviewed-by: hjk <qthjk@ovi.com>
 2012-05-07 13:19:16 +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
hjk 2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
Friedemann Kleint 689903164a qtcreatorcdbext: Simplify Qt 5 code. 
Change-Id: I3c62cd7d371312bed1c1c3f5220af86d64143e88
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-12-20 16:21:13 +01:00
hjk 31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Friedemann Kleint 7fbbe77874 Debugger[CDB]: Rework string formatting. 
Use watch encoding without quotes for non-ASCII output.
Use formats with quotes for recoded strings.
Extend char-pointer recoding to work for char-arrays as well
and restrict to char types. Split up and re-use when
outputting QByteArrays or std::[w]string.

Task-number: QTCREATORBUG-5667
Change-Id: If9748c2e375ee5ecb05d257410eba4012de1c3cf
Reviewed-on: http://codereview.qt.nokia.com/2747
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-08 15:00:57 +02:00
Friedemann Kleint d9513ac673 Debugger[CDB]: Work on Qt 5 types. 
Task-number: QTCREATORBUG-5475

Change-Id: Ic034f0f73a9dc375751dcb7dc463786ba596bec9
Reviewed-on: http://codereview.qt.nokia.com/2296
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-27 17:15:10 +02:00
Friedemann Kleint a83d463fa5 Debugger[CDB]: Make Qt 5's QString/QByteArray editable. 
Introduce struct & routine to return address data for QStrings/
QByteArray of versions 4,5 and use that.

Change-Id: I0603d160561bd28ef13bf79739b44b8af439bd93
Reviewed-on: http://codereview.qt.nokia.com/1770
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-18 15:13:56 +02:00
Friedemann Kleint 8a28b3c01c Debugger[CDB]: Dump Qt5's new QString, QByteArray classes. 
Task-number: QTCREATORBUG-5475

Change-Id: Iee10910e55df8b8308711818da2847b09a52fe92
Reviewed-on: http://codereview.qt.nokia.com/1711
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-15 17:14:55 +02:00
Friedemann Kleint f231c2468b Debugger[CDB]: Display VTable-pointers as hex. 
Task-number: QTCREATORBUG-5381

Change-Id: I840296ddfb297f2a60c8d2e83c541c75df1aa23d
Reviewed-on: http://codereview.qt.nokia.com/1504
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-12 11:42:50 +02:00
hjk 6e5908625f debugger: show cdb vtable pointer in hex 
Change-Id: I8deb537ce837e54315b0f0a64897363f70344137
Reviewed-by: Friedemann Kleint
Task-number: QTCREATORBUG-5381
Reviewed-on: http://codereview.qt.nokia.com/1405
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-11 12:33:15 +02:00