feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,554 Commits 108 Branches 368 Tags
5294db3d16a8d30b604144de0a490774c7066b09
Commit Graph

113 Commits

Author SHA1 Message Date
Oswald Buddenhagen
ff456bb4b6 replace in-place-rewriting of files with a read/modify/write cycle 
easier to handle errors that way
 2011-04-18 14:10:14 +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
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Christian Kandeler
482bf10c09 Maemo: Fix tarball creation. 2011-04-07 11:44:24 +02:00
Christian Kandeler
1352ae3deb Maemo: Implement tar package creation step. 
Currently unused.
 2011-04-05 17:25:34 +02:00
con
7bd87aed36 Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline 
Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
 2011-04-01 10:33:20 +02:00
con
1c2da511b9 Merge remote branch 'origin/2.2' 
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
 2011-04-01 09:53:09 +02:00
Christian Kandeler
2407f4258f ProjectExplorer: Adapt output window clients to fixed newline handling. 
Reviewed-by: dt
 2011-03-31 18:33:27 +02:00
Christian Kandeler
62b2b6f894 Maemo: Filter NUL characters from rrpmbuild output. 2011-03-30 11:25:33 +02:00
Christian Kandeler
250d483701 Maemo: Fix package renaming for Debian. 
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=235909
 2011-03-29 11:55:58 +02:00
Bill King
047cb50a6b Fix build. 2011-03-09 17:04:50 +01:00
Christian Kandeler
439b45618e Start making the Maemo support more generic. 
This includes:
    - decoupling deploy configurations from targets (Reviewed-by: dt)
    - adding a "Generic Linux" device type
    - splitting up the Maemo deployment step into small pieces that
      can be combined in different ways (and much more easily maintained)
    - adding a new version handler for pro.user files
      (Reviewed-by: Tobias Hunger)

Also:
  - Add and use an SSH manager class for easier connection sharing.
  - Make the SSH connection parameters a fixed attribute of the connection.
 2011-03-09 13:10:19 +01:00
Christian Kandeler
1501292402 Maemo: Get rid of unneeded code. 
All this environment setting was just an approximation of what the
"mad" script does better.
 2011-02-09 15:10:51 +01:00
Christian Kandeler
eeedd340a8 Maemo: Remove redundant code for adding "-t <target>" to mad command. 2011-02-01 14:08:12 +01:00
Christian Kandeler
14cb9f91ad Make Meego target work. 
- Package installation and running untested yet.
- User currently needs to adapt %files section in spec file manually.
  We expect this task to be automated by the build script in the future
  (see http://bugs.meego.com/show_bug.cgi?id=13148).
 2011-02-01 14:08:12 +01:00
Christian Kandeler
d5d7aeebc5 Maemo: Introduce abstract class for debian-based Maemo targets. 2011-01-24 18:46:04 +01:00
Christian Kandeler
4aca17427a Maemo: Adapt package names so that OVI store will accept them. 
Task-number: QTCREATORBUG-3189
 2011-01-20 12:38:29 +01:00
Christian Kandeler
3a87fdd5f1 Maemo: Move more functionality into the new target classes. 2011-01-19 11:07:14 +01:00
Christian Kandeler
f0a54abf6b Maemo: Introduce dedicated Fremantle and Harmattan targets. 
Task-number: QTCREATORBUG-2770
 2011-01-18 15:22:12 +01:00
Christian Kandeler
ce0da603e8 Maemo: Make use of new Qt4MaemoTarget class. 
This allows us to get rid of MaemoTemplatesManager, which was a bit of
a crutch from the beginning.
 2011-01-17 19:45:42 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
Christian Kandeler
6926561572 Maemo: Enable dependency checking for release builds and publishing. 
Task-number: QTCREATORBUG-3228
 2011-01-06 15:47:24 +01:00
Christian Kandeler
3e085fedd6 Maemo: Fix Windows compilation. 2011-01-04 15:58:56 +01:00
Christian Kandeler
3cb34cf8ec Maemo: Move MADDE environment information out of MaemoToolChain class. 
The toolchain is not available in all places where we need the
respective information, which resulted in duplicated code.
 2011-01-04 14:15:57 +01:00
con
519b544f62 Merge remote branch 'origin/2.1' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qt4projectmanager/qmakestep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
 2010-12-08 10:57:21 +01:00
Christian Kandeler
31422318d6 Maemo: Manually add "execute" bit to debian/rules file. 
The file is expected to be executable on Linux. However, when it
was created on Windows and checked into a repository, the
bit will not be set when pulling it onto a Linux system, resulting
in packaging failure.

Task-number: QTCREATORBUG-3277
Reviewed-by: kh1
Reviewed-by: dt
 2010-12-06 11:50:18 +01:00
Christian Kandeler
60cd3d1847 Maemo: Call dpkg-buildpackage via mad script. 
Task-number: QTCREATORBUG-2708
Reviewed-by: kh1
 2010-12-01 13:32:07 +01:00
Christian Kandeler
7fd0b2dbb6 Maemo: Fix code redundancy. 
Recursively removing a directory was implmented twice.
 2010-11-26 12:20:18 +01:00
Christian Kandeler
20b58e4e6e Maemo: Whitespace fixes. 2010-11-26 10:41:39 +01:00
Christian Kandeler
f8979403ce Maemo: Fix Harmattan icon workaround. 
Don't hardcode PNG format.
 2010-11-26 10:38:25 +01:00
Christian Kandeler
218978a74a Maemo: Small deployment refactoring. 2010-11-26 10:38:25 +01:00
Christian Kandeler
ed5f9bf0fe Maemo: For deployment, use our models directly. 
Don't waste time going through the Qt4ProFileNodes.
 2010-11-26 10:38:25 +01:00
Christian Kandeler
714f7656a6 Maemo: Fix desktop file in binary package. 
Ensure that the desktop files we deploy contain the right path
to the executable.

Reviewed-by: kh1
 2010-11-24 15:52:50 +01:00
Christian Kandeler
0fa980028e Maemo: Remove "cd" call from package creation preparation. 
At some point, we thought it was necessary, but apparently it's not.

Reviewed-by: kh1
 2010-11-17 18:23:26 +01:00
Christian Kandeler
1166dc39da Maemo: Use current build environment for packaging. 
(Instead of the initial system environment.)

Reviewed-by: kh1
 2010-11-17 11:10:37 +01:00
Christian Kandeler
667d645611 Maemo: By default, strip release binaries. 
But never strip debug binaries.

Task-number: QTCREATORBUG-2981
 2010-11-02 16:17:41 +01:00
Oswald Buddenhagen
a9ff4d3749 Merge remote branch 'origin/2.1' 
Conflicts:
	doc/qtcreator.qdoc
 2010-11-01 12:11:03 +01:00
Christian Kandeler
4956440109 Maemo: Fix logic deciding on package rebuilding. 
The time stamp check must descend into directories.

Task-number: QTCREATORBUG-2920
Reviewed-by: con
 2010-10-28 10:55:49 +02:00
Christian Kandeler
dbd3965241 Maemo: Remove additional parsing step. 
Instead, utilize the newly added INSTALLS information of Qt4ProFileNode.

Task-number: QTCREATORBUG-2679
 2010-10-28 09:25:18 +02:00
Friedemann Kleint
54569c0624 Merge remote branch 'origin/2.1' 2010-10-27 11:05:31 +02:00
Christian Kandeler
fe72f7c2f9 Maemo: Have only one MaemoDeployables object per Maemo target. 
It does not depend on any of the settings in the deploy configuration.

Task-number: QTCREATORBUG-2678
 2010-10-27 10:53:57 +02:00
Sergey Belyashov
b10c8db6da Fixed double word in message 
Adjusting the source in all affected translations as well.

Merge-request: 192
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-10-25 16:46:14 +02:00
Christian Kandeler
9137c376e0 Maemo: Don't monopolize the debian directory. 
Using a debian directory in the project root directory might interfere
with non-MADDE configurations.
We therefore introduce an extra directory qtc_packaging, where we can
safely put our stuff. In the future, this should also contain
non-Fremantle (and possibly non-Debian) configurations.

Reviewed-by: Oswald Buddenhagen
 2010-10-18 17:47:10 +02:00
Christian Kandeler
29d4a329af Maemo: Fix desktop file contents, ignore missing desktop file. 
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=195541
Reviewed-by: kh1
 2010-10-04 13:32:08 +02:00
Christian Kandeler
995b6db0a4 Maemo: Add deployment information to library wizard. 
Reviewed-by: kh1
(cherry picked from commit f1cb362d0d)
 2010-09-28 09:19:26 +02:00
Christian Kandeler
1f79ca6eb5 Maemo: Add workaround for Harmattan application icon bug. 
https://projects.maemo.org/bugzilla/show_bug.cgi?id=190848

Reviewed-by: kh1
 2010-09-23 15:07:54 +02: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
Christian Kandeler
18270ca432 Maemo: Add safety check. 
Apparently, the sender can still be null even though it's deleted
via deleteLater().
 2010-08-30 17:58:36 +02:00
Christian Kandeler
1ebb02b165 Maemo: Fix object deletion issue in packaging step. 
Reviewed-by: kh1
 2010-08-27 12:40:03 +02:00
Christian Kandeler
87a6db0990 Maemo: Lose one level of packaging directory structure. 
We will now behave friendlier to projects that already have a
debian directory. Also, building a source package will be more
straightforward.

Reviewed-by: kh1
 2010-08-27 12:40:03 +02:00