hjk
|
7986fbd08d
|
cvs: polish style
Change-Id: Ica92448617e46223f99a5009e4a7493b83d4cda9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
2012-01-11 12:56:14 +01:00 |
|
Eike Ziller
|
85cf2b661e
|
Merge remote-tracking branch 'origin/2.4'
Conflicts:
src/libs/qmljs/qmljsinterpreter.cpp
src/libs/qmljs/qmljsinterpreter.h
src/plugins/debugger/qml/scriptconsole.cpp
src/plugins/git/gitplugin.cpp
src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h
Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
|
2011-11-11 09:46:25 +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 |
|
hjk
|
29279ab8c7
|
more style fixes of string literal access
Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096
Reviewed-by: hjk <qthjk@ovi.com>
|
2011-11-02 18:20:19 +01:00 |
|
Tobias Hunger
|
aa2acec14c
|
Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
|
2011-05-06 15:17:05 +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 |
|
Jarek Kobus
|
4d69c7455e
|
Remove unused constants, fix lacking virtual destructor
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
|
2011-04-14 12:08:47 +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 |
|
hjk
|
9595504bda
|
Long live the king!
|
2010-03-05 11:28:13 +01:00 |
|
Tobias Hunger
|
cacdc6c736
|
Add display name to VCS plugin structs
Reviewed-by: Friedemann Kleint
|
2010-01-08 11:51:53 +01:00 |
|
hjk
|
93cbef8724
|
long live the king
|
2009-08-14 09:30:56 +02:00 |
|
Friedemann Kleint
|
18f9375501
|
Add a CVS plugin for use with UNIX cvs or Tortoise CVS.
|
2009-07-15 12:28:40 +02:00 |
|