Oswald Buddenhagen
dc3c156cac
Merge branch '2.2'
...
Conflicts:
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
src/plugins/qt4projectmanager/qt4target.cpp
src/plugins/qt4projectmanager/qt4target.h
src/plugins/qt4projectmanager/qtoptionspage.h
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00
hjk
8397663964
Update license.
2011-04-13 11:49:28 +02:00
Friedemann Kleint
12fd1dbb70
Core/ProjectExplorer: Deprecate QDom in favour of QXmlStream-classes.
...
Rewrite PersistentSettingsReader/Write and CommandsFile to
use QXmlStreamReader/Writer.
Files will now be written out using native line endings and
contain proper XML version information.
Keyboard schemes will contain empty shortcut elements for empty
elements.
Rubber-stamped-by: con
2011-03-31 16:03:30 +02: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
hjk
2d6ad5694e
coreplugin: introduce an 'Id' class, intended as successor for generic QStrings
...
to identify actions etc.
2010-09-10 17:22:28 +02:00
hjk
f56dacc76f
Core::Context: remove special handling of C_GLOBAL_ID/C_GLOBAL
2010-06-28 14:30:03 +02:00
hjk
2f5f358ff4
Core::Context: compile hot fix for Windows.
2010-06-25 17:38:25 +02:00
hjk
9595504bda
Long live the king!
2010-03-05 11:28:13 +01:00
hjk
93cbef8724
long live the king
2009-08-14 09:30:56 +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
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
hjk
df7aacd637
more file cosmetics
2008-12-02 15:08:31 +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
con
05c35356ab
Initial import
2008-12-02 12:01:29 +01:00
