Commit Graph

19 Commits

Author SHA1 Message Date
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Kai Koehne
cecc46b940 Replace QString::fromLocal8Bit("") calls
Calling fromLocal8Bit() for literals is wrong, since that depends
ont the user's environment. We use latin1 strings exclusively in Qt.

Change-Id: I0cd0986787ea630425773672d3a892fbd0f0a77a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-05 15:27:25 +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
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
Fawzi Mohamed
e4eaf929dc namedemangler: move template implementation to the .h file
NonNegativeNumberNode<base>::mangledRepresentationStartsWith is used by
the tests, so moving that implementation to the .h file

Change-Id: I42267030dcbd9d128d5cc165a8d688a68354eb90
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-01-17 17:17:32 +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
5b69bee198 Use QT_NO_CAST_FROM_ASCII for debugger plugin.
Fix gdmi escape routine by using a traits class to adapt
QByteArray/QString.

Change-Id: Ic6d2a0c927e4613aec9f69095bbb04a393e9edb9
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 09:46:25 +02:00
Friedemann Kleint
2f51579fe4 Debugger: Fix string usages.
- Compile with QT_NO_CAST_FROM_ASCII.
- Remove single character string constants.

Change-Id: Icece98619b6c30e047d3fce00e6ae74bbcd53c67
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-22 12:24:24 +02:00
hjk
4a2787df73 demangler: compile fix
Change-Id: I95af5519cb41fd9aa7194447b5a8349b1eb5b810
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-15 13:53:12 +02:00
Orgad Shaneh
fec5ef3df9 NameDemangler: Fix compilation with MSVC
parsetreenodes.cpp(1464) : error C2899: typename cannot be used outside a template declaration

Change-Id: Ie3235d186b2865a15e57439467e2bab7389dab1d
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-15 10:11:26 +02:00
Christian Kandeler
26c4329f74 Name demangler: Fix reference collapsing.
Change-Id: I7bcf1ace346ffcb5e05242f6cedfc5439c97fff9
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-08-13 12:30:10 +02:00
Christian Kandeler
7b8eafc671 Name demangler: Add missing initialization.
Change-Id: I8284707c92221560115f2b5e4428b42013094cc6
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-30 15:01:28 +02:00
Christian Kandeler
873ed7186f Name demangler: Fix some substitution bugs.
Also try to collapse references as much as it is possible with the
current design.

Change-Id: I1de55eac2d681a36f8b77d77968c4a06d19b6fac
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-25 11:45:53 +02:00
Christian Kandeler
94dda38664 Name demangler: Try to fix template parameter packs.
Hard to test at the moment: gcc and clang produce different manglings,
neither of which c++filt can decode.

Change-Id: Ic4ad8887a3ad76086cd8be911334dda21afa85db
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-20 15:47:37 +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
Christian Kandeler
3afbd2f912 Debugger:Sync name demangler with specification.
The new stuff is mostly C++11 features (closures etc.).
Also fix a number of bugs uncovered along the way.
All tests succeed now, including the examples
from the specification.

Change-Id: I9b224b0dd82ad8f5b17d5f5d1809d1dea1a7a803
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-12 14:20:52 +02:00
Christian Kandeler
889409f2cd Debugger: Name demangler improvements.
- Fix assertion macro.
- Make parse tree smaller by getting rid of nodes that serve no purpose.
- Add all examples from the ABI spec to the auto test.

Change-Id: Id63d8330e6380bfb7d56acd1d445f7b70a1f6e70
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-09 12:14:46 +02:00
Christian Kandeler
96368496dc Debugger: Refactor name demangler.
Now all the parsing logic as well as the stringification is in the tree
nodes.

Change-Id: Ie8222729c14c0102d94045026fc61a75cd31cc63
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-06 19:55:09 +02:00
Christian Kandeler
b206feabe7 Debugger: Refactor name demangler.
So far, we converted the mangled to the demangled representation on the
fly while parsing. Because some demangled strings look different
depending on higher-level context, awkward string manipulations were
then necessary at some later point.
The new solution is much more easily maintainable, creating a tree with
a node for every rule in the grammar first and converting the complete
tree to the demangled string later.

Change-Id: I59088df259611d7cd78af47b81b6a21d628a787f
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-06 10:20:39 +02:00