feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
11,565 Commits 108 Branches 368 Tags
28f6430f9d1b5594499fd540ecbcd39efbaaefd2
Commit Graph

32 Commits

Author SHA1 Message Date
kh1
f3171e8349 We need to cache the version number, since it can be changed 
during the generation process and copy might fail afterwards.
 2010-06-28 17:58:30 +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
ck
aa4d7417ce Maemo: Use generic package build command. 
Reviewed-by: kh1
 2010-06-21 10:51:18 +02:00
con
458a25efa9 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qt-html-templates.qdocconf
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmljseditor/qmljscodecompletion.cpp
 2010-06-18 16:54:37 +02:00
ck
cfdb5d7446 Maemo: Remove packaging timeout. 
Reviewed-by: kh1
 2010-06-17 12:24:37 +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
con
b0040dc858 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/projectexplorer/taskwindow.cpp
	src/shared/proparser/profileevaluator.cpp
 2010-06-10 15:00:16 +02:00
dt
181cecbb32 Port the compile output window away from HTML to QTextCharFormat 
Is more then twice as fast
 2010-06-08 15:23:58 +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
con
7f4cbe2383 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/debugger/moduleshandler.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
 2010-05-20 09:28:00 +02:00
ck
7948147410 Maemo: Better error handling for packaging commands. 2010-05-19 15:59:27 +02:00
ck
2be1f9c61b Maemo: Preparation for deploying executable to arbitrary location. 
Reviewed-by: kh1
 2010-05-19 14:12:13 +02:00
ck
3867325522 Maemo: Serialize package contents. 
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
26e9569a6c Maemo: Deduce correct target file name for library template. 2010-05-05 09:14:11 +02:00
ck
b61e656493 Maemo: Preparation for deploying executable to arbitrary location. 
Reviewed-by: kh1
 2010-05-03 16:56:38 +02:00
ck
54560de48f Maemo: Serialize package contents. 
Reviewed-by: kh1
 2010-05-03 15:50:40 +02:00
ck
7140288c40 Maemo: Make package contents user-editable. 
Reviewed-by: kh1
 2010-05-03 15:50:40 +02:00
ck
83f505d96a Maemo: Add model for future package contents view. 
No functional changes for now.

Reviewed-by: kh1
 2010-04-20 17:15:53 +02:00
ck
f58febc4d6 Maemo: For packaging errors, add dh_* stdout to the error message. 2010-04-19 10:07:55 +02:00
ck
c31d70743e Maemo: Make packaging errors appear in task windows. 
Reviewed-by: kh1
 2010-04-15 14:47:01 +02:00
ck
44a953e84c Maemo: Deploy and install packages instead of raw executables. 
Reviewed-by: kh1
 2010-04-15 14:47:01 +02:00
ck
5df34cad07 Maemo: Fix package name construction. 2010-04-15 11:37:50 +02:00
ck
3d8537922c Maemo: Introduce functions for package name construction. 2010-04-14 15:08:13 +02:00
ck
14ceda410c Maemo: Put package creation widget into its own class. 
It will grow.
 2010-04-14 09:49:40 +02:00
kh1
a5cd901747 Debian packaging does now work on windows. 2010-04-09 18:25:29 +02:00
kh1
be3c59e96e The path separator depends on the OS. 2010-04-09 17:14:05 +02:00
kh1
fa76824aa9 Make sure we get the executable without debug/ release and suffix on win. 2010-04-09 16:52:53 +02:00
ck
a62e533123 Maemo: Implement basic packaging. 2010-04-07 17:36:28 +02:00
ck
29e8e70b1c Add skeleton for Maemo package creation build step. 
(No actual functionality yet.)

Reviewed-by: kh1
 2010-04-06 16:57:29 +02:00