ck
|
f43095ceaf
|
Maemo: Prepare infrastructure for proper subdirs support.
No difference in functionality yet.
Reviewed-by: kh1
|
2010-07-06 12:06:03 +02:00 |
|
kh1
|
28f6430f9d
|
Fix broken version number to due missing valueChanged signals.
Reviewed-by: ck
|
2010-06-29 14:13:11 +02:00 |
|
kh1
|
6b089ee88f
|
Allow the user to set the version number used for the build deb package.
Cherry-picked from 2.0 branch.
Task-number: QTCREATORBUG-1670
Reviewed-by: ck
|
2010-06-28 13:59:04 +02:00 |
|
con
|
af44136e22
|
Merge remote branch 'origin/2.0'
Conflicts:
doc/qtcreator.qdoc
src/plugins/help/helpplugin.cpp
src/plugins/projectexplorer/projectexplorer.cpp
src/plugins/projectexplorer/projectexplorer.h
src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
src/tools/qml/qmldump/main.cpp
|
2010-06-24 11:40:22 +02:00 |
|
ck
|
dd666a3af4
|
Maemo: Add option to disable packaging.
Task-number: QTCREATORBUG-1636
Reviewed-by: kh1
|
2010-06-22 14:45:09 +02:00 |
|
ck
|
f96efa07e1
|
Maemo: Use project file's INSTALLS variable for packaging.
|
2010-06-16 08:57:13 +02:00 |
|
con
|
30fae3eab1
|
Merge remote branch 'origin/2.0'
Conflicts:
doc/qtcreator.qdoc
src/plugins/projectexplorer/taskwindow.h
src/plugins/qmldesigner/designercore/model/modelmerger.cpp
src/plugins/qmljseditor/qmljshoverhandler.h
src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
src/plugins/subversion/subversionplugin.cpp
|
2010-06-11 16:30:39 +02:00 |
|
ck
|
5221e8eff9
|
Maemo: Make packaging step optional.
Reviewed-by: kh1
|
2010-06-11 11:58:46 +02:00 |
|
ck
|
d0d61182cb
|
Maemo deployment: Force remote file name to be same as local file name.
INSTALLS does not support an arbitrary target file name.
Reviewed-by: kh1
|
2010-06-07 17:18:06 +02:00 |
|
kh1
|
0d9c210369
|
Use native separator and make the line not wrap in the table view.
Reviewed-by: ck
|
2010-05-31 12:39:40 +02:00 |
|
ck
|
c734a81885
|
Maemo: Make remote path field editable in package widget.
Reviewed-by: kh1
|
2010-05-19 14:12:13 +02:00 |
|
ck
|
b367cffa8c
|
Maemo: Make package contents user-editable.
Reviewed-by: kh1
|
2010-05-19 14:12:13 +02:00 |
|
ck
|
df07adcd41
|
Maemo: Make remote path field editable in package widget.
Reviewed-by: kh1
|
2010-05-04 11:39:47 +02:00 |
|
ck
|
7140288c40
|
Maemo: Make package contents user-editable.
Reviewed-by: kh1
|
2010-05-03 15:50:40 +02:00 |
|
ck
|
e112c6a9bf
|
Maemo: Add simple widget for package configuration.
|
2010-04-26 14:12:45 +02:00 |
|
ck
|
14ceda410c
|
Maemo: Put package creation widget into its own class.
It will grow.
|
2010-04-14 09:49:40 +02:00 |
|