Oswald Buddenhagen
|
fae7dc9584
|
add errorString output argument to IFile::reload() & IEditor::open()
add/unify read error handling in all affected classes
|
2011-04-18 14:10:13 +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
|
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 |
|
Friedemann Kleint
|
24cadd34a1
|
I10N: First translation fixes for 2.1
Fix README, some spelling errors, remove contractions,
exclamation marks, correct some plural forms, join split messages.
Add QCoreApplication::translate to non-Q_OBJECT-classes.
Fix some lupdate warnings about discarding meta-data (//:).
|
2010-09-10 10:51:43 +02:00 |
|
hjk
|
2f5f358ff4
|
Core::Context: compile hot fix for Windows.
|
2010-06-25 17:38:25 +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 |
|
Denis Mingulov
|
89280929dc
|
ImageViewer: Register the actions with the action manager
Merge-request: 2165
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
|
2010-06-18 11:50:42 +02:00 |
|
Denis Mingulov
|
b2fabac69e
|
ImageViewer: Pick up the icons from the system theme using QIcon::fromTheme
Merge-request: 2165
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
|
2010-06-18 11:50:41 +02:00 |
|
Denis Mingulov
|
aa7d2c54d3
|
ImageViewer: Reimplemented as a new plugin
Merge-request: 2165
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
|
2010-06-18 11:50:41 +02:00 |
|