hjk
3ac9bee144
core: make mode creation more uniform
2011-04-14 13:31:54 +02:00
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
be9455bc50
mode: make displayname, icon, priority, id, type data members
2011-04-14 11:15:08 +02:00
hjk
70d392d235
core: make context and widget IContext data members
2011-04-14 11:15:07 +02:00
hjk
8397663964
Update license.
2011-04-13 11:49:28 +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
dt
08ccda5862
EditorManager: Change openEditor/activateEditor to not do mode switching
...
Also introduce a indirection, modes have now types, edit and debug have
the same type, and editors do have a prefered type of modes instead of a
prefered mode.
That fixes the bug that if the prefered qml editing mode was set to
design, then in switching between qml editors would
- in Edit Mode: stay in edit mode
- in Debug Mode: switch to debug mode
2010-09-14 15:23:11 +02:00
hjk
c7e8b51d37
core: use a class derived from QList<int> instead of a QList<int> for Core::Context
...
A mostly mechanical change.
Reviewed-By: con
2010-06-25 12:58:07 +02:00
Friedemann Kleint
bbcacaf59f
Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4.
2010-03-18 10:59:06 +01:00
hjk
9595504bda
Long live the king!
2010-03-05 11:28:13 +01:00
Tobias Hunger
a6ad773722
Make method naming more consistent.
...
* Use id() for methods returning a string used to represent
some type of object.
* Use displayName() for strings that are meant to be user
visible.
* Quieten some warnings while touching the files anyway.
* Move Factories to their products in the plugins where that
was not done before.
Reviewed-by: dt
2010-01-07 18:17:24 +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
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
