Eike Ziller
6fd252b0a5
Merge remote-tracking branch 'origin/2.6'
...
Conflicts:
share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
src/plugins/debugger/qtmessageloghandler.cpp
src/plugins/debugger/qtmessageloghandler.h
src/plugins/debugger/qtmessagelogwindow.cpp
src/plugins/madde/maemodeployconfigurationwidget.cpp
src/plugins/madde/maemodeployconfigurationwidget.h
src/plugins/remotelinux/deployablefilesperprofile.cpp
src/plugins/remotelinux/deployablefilesperprofile.h
src/plugins/remotelinux/deploymentinfo.cpp
src/plugins/remotelinux/deploymentinfo.h
src/plugins/remotelinux/deploymentsettingsassistant.cpp
src/plugins/remotelinux/profilesupdatedialog.cpp
src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
tests/auto/icheckbuild/ichecklib.cpp
tests/auto/icheckbuild/ichecklib_global.h
tests/auto/icheckbuild/parsemanager.cpp
tests/auto/icheckbuild/parsemanager.h
tests/manual/ssh/tunnel/tunnel.h
Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
2012-10-05 21:20:50 +02: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
Christian Kandeler
938612c35e
Do not use QAbstractItemModel::reset().
...
Change-Id: Ie49bdf576a6d3543aef6df133b27c8827775c935
Rationale:
a) It is conceptually cleaner to do the changes to the model
in between calls to beginResetModel() and endResetModel,
respectively.
b) The function is deprecated in Qt 5, for exactly that reason.
Reviewed-by: hjk <qthjk@ovi.com >
2012-09-20 11:11:45 +02:00
Francois Ferrand
9c7b96c663
Fix display of templates in outline.
...
Change-Id: I8b099c8234fac55ef0de17b014c89fbe02534bf4
Reviewed-by: Leandro Melo <leandro.melo@nokia.com >
2012-08-21 08:58:52 +02:00
hjk
e481b1ad27
libs/cplusplus: remove unneeded #includes
...
Change-Id: Iadd8ace8a3870a9b0046dc65bf00d7e702e15b97
Reviewed-by: hjk <qthjk@ovi.com >
2012-08-15 13:30:23 +02:00
hjk
6a7cf405bd
rename QtDebug to QDebug
...
More uniform.
Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2
Reviewed-by: Robert Loehning <robert.loehning@nokia.com >
2012-08-06 14:55:08 +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
Francois Ferrand
e203893fd1
Add function return type in outline.
...
Append the function return type in outline (after arguments), consistently with
variable type indication.
Change-Id: I1cc6d69634fc83227eb7fc9e3a0ee2ad6ca6ace8
Reviewed-by: Leandro Melo <leandro.melo@nokia.com >
2012-07-17 19:05:43 +02:00
Erik Verbruggen
3fa55b7ab9
Removed module names from #include directives.
...
Getting the #include directives ready for Qt5. This includes the
new-project wizards.
Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com >
2012-02-15 16:24:46 +01: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
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
Tobias Hunger
aa2acec14c
Fix/add copyright headers
...
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
hjk
8397663964
Update license.
2011-04-13 11:49:28 +02:00
Friedemann Kleint
edb4893547
Header cleanup in src, specify module name.
2011-01-24 12:29:48 +01:00
con
d1023c7614
It's 2011 now.
...
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
con
04e32b0049
License headers.
2010-12-17 16:03:42 +01:00
Roberto Raggi
05f2fd6669
Renamed Symbol::scope() to Symbol::enclosingScope().
2010-08-26 16:16:22 +02:00
Roberto Raggi
0540aa362d
Get rid of the old Semantic pass.
2010-08-13 16:55:43 +02:00
Roberto Raggi
16b1e8b40d
Renamed Symboo::isScopedSymbol().
2010-08-12 12:35:22 +02:00
Roberto Raggi
354b9712e4
Merged ScopedSymbol and Scope.
2010-08-11 15:25:18 +02:00
hjk
9595504bda
Long live the king!
2010-03-05 11:28:13 +01:00
Erik Verbruggen
ff910fd757
Added "@property" to the outline entries for ObjC properties.
2010-01-22 13:24:06 +01:00
hjk
93cbef8724
long live the king
2009-08-14 09:30:56 +02:00
Erik Verbruggen
86a7b26fcd
Fixed semantic checks for Objective-C methods and fast-enumeration.
2009-08-05 18:30:18 +02:00
Erik Verbruggen
4a0da2c6f2
Added Semantic checks for ObjC methods.
2009-07-31 16:03:48 +02:00
Jason McDonald
884b7af769
Update license headers and sales contact details.
...
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
hjk
8ca887aae2
Fixes: change file license headers to include LGPL
2009-02-25 09:15:00 +01:00
Thorbjørn Lindeijer
a33ae02927
Revert now unnecessary checks for null-types
...
This reverts commits:
c721304a47885d908ea3a0909989f7fb4ad59ddb0a9a67cf540d1624d4d1d018cfd5cb0504fdd00ba2fd10fe19
2009-02-10 17:41:04 +01:00
Roberto Raggi
a2fd10fe19
Fixes: Possible crash in OverviewModel.
2009-02-09 17:55:40 +01:00
Roberto Raggi
d01795d933
Reimplemented Type::as*Type() using virtual methods.
2009-02-09 17:49:12 +01:00
Daniel Molkentin
59affcfffc
Bump year in licence header.
2009-01-13 19:22:14 +01:00
hjk
da3cb14483
chancge Nokia GPL exception version from 1.2 to 1.3
2008-12-16 17:20:00 +01:00
Roberto Raggi
fdfae53abb
Don't use QTC_ASSERT in the C++ front-end library. The engine does not
...
recover from invalid asserts, so it will crash anyway, but not in
a controlled environment.
2008-12-10 15:44:26 +01:00
hjk
4a552ead9f
use QTC_ASSERT instead of Q_ASSERT
2008-12-09 15:25:01 +01:00
con
be9dfc8c91
Fixes: - Show <No Symbols> or <Select Symbol> in 'empty' method combo box
...
Task: - 234321
RevBy: - Bjoern
2008-12-08 17:50:46 +01:00
hjk
ab83dcd87c
off-by-one in headers
2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3
end-of-line whitespace correction of the new headers
2008-12-02 14:17:16 +01:00
hjk
f61e8672db
more cosmetic changes
2008-12-02 14:09:21 +01:00
con
05c35356ab
Initial import
2008-12-02 12:01:29 +01:00
