feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
12,609 Commits 108 Branches 368 Tags
baf10259a384777c1310707244d2d2739bb2ed56
Commit Graph

55 Commits

Author SHA1 Message Date
ck
cbf31293cb Maemo: Adapt to new deploy configuration approach. 
Reviewed-by: Tobias Hunger
 2010-08-02 16:01:53 +02:00
Tobias Hunger
ee4a04a20b Refactor deployment 
* Add a DeployConfiguration class to hold settings related
   to deployment.
 * Add BuildStepsList to hold a list of buildsteps
 * Update BuildConfiguration to use BuildStepLists instead of
   manageing lists of buildsteps itself.
 * Update BuildManager to use BuildStepLists in its interfaces
 * Fix fallout introduced by API changes
 * Update .user file to new way of storing settings

Task-number: QTCREATORBUG-1427
Task-number: QTCREATORBUG-1428
Task-number: QTCREATORBUG-1811
Task-number: QTCREATORBUG-1930
 2010-08-02 14:21:05 +02:00
ck
16e9d050b8 Maemo: Always show correct package path. 
We now react to the build directory being changed.

Reviewed-by: kh1
 2010-07-28 16:13:34 +02:00
ck
31189a6064 Maemo: Revert change accidentally introduced by merge. 2010-07-28 14:34:02 +02:00
Christian Kamm
e03a6b6ea2 Merge branch '2.0' 
Conflicts:
	share/qtcreator/qml-type-descriptions/qml-builtin-types.xml
	src/plugins/debugger/stackhandler.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
 2010-07-28 14:20:44 +02:00
ck
01f90a9723 Maemo: Don't use dpkg-buildpackage. 
Reverts the core changes of 5b47f47dc9,
which was a horrible mistake and could not possibly have worked
with this branch.
 2010-07-28 11:53:12 +02:00
ck
5ff0d9b72f Maemo: Rename some classes. 
All our classes should have the Maemo prefix because we don't have
a namespace of our own.
 2010-07-28 09:36:30 +02:00
con
39a8e97775 Merge commit origin/2.0 '1a985148340ff3b29c752036857446452cf0907f' 
Conflicts:
	src/plugins/qmldesigner/settingspage.ui
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
 2010-07-26 12:26:05 +02:00
ck
e4a2b6fd7d Don't run dh_shlibdeps by default. 
This particular script is responsible for > 90% of packaging time.

Reviewed-by: kh1
 2010-07-21 12:21:29 +02:00
kh1
71f2b50e0f Fix package building after version number change. 
Should have been part of 5b47f47dc9
 2010-07-16 12:50:33 +02:00
kh1
fa81b861ed Fix building projects if MADDE is on a different drive then the project. 
Task-number: QTCREATORBUG-1649
Reviewed-by: ck
 2010-07-16 12:44:07 +02:00
dt
615cda8430 Fix compile output to be readeable with dark themes 
This changes the colors to be a mix of red/blue and the foreground
color. If the regular text color is either of those, well...
 2010-07-15 11:11:21 +02:00
ck
8a3c1cc0d4 Maemo: Move INSTALLS information from package step to deploy step. 
... because the files are installed even when packaging is disabled.

Reviewed-by: kh1
 2010-07-14 12:22:30 +02:00
ck
5b47f47dc9 Maemo: Use dpkg-buildpackage instead of calling dh-scripts manually. 
Note to the merge person: This commit might trigger a merge conflict.
In that case, just use the code from the master branch.
 2010-07-09 08:31:14 +02:00
ck
608fcf3123 Maemo: Correctly deploy subdirs projects. 
Task-number: QTCREATORBUG-1614, QTCREATORBUG-1810
Reviewed-by: kh1
 2010-07-07 14:51:46 +02:00
Tobias Hunger
6dd2ef53fa Fix directory separator 2010-07-06 17:02:48 +02:00
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
ck
2dfa9772f6 Maemo: Add detailed package creation output. 2010-07-01 11:56:02 +02:00
con
ede2a7c975 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/gdbmacros/dumper.py
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
 2010-06-30 14:25:09 +02:00
ck
dcd62a2a92 Maemo: Move .pro file operations into their own class. 2010-06-29 14:15:41 +02:00
ck
d54673c017 Maemo: Fix incorrect assumption about build directory. 
Reviewed-by: kh1
 2010-06-29 13:40:03 +02:00
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
kh1
eaf8d2692e Allow the user to set the version number used for the build deb package. 
Task-number: QTCREATORBUG-1670
Reviewed-by: ck
 2010-06-28 12:37:47 +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
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