feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
20,621 Commits 108 Branches 368 Tags
bbfa7e002003f4f0dfd0db8e26e87c6a06b462e6
Commit Graph

55 Commits

Author SHA1 Message Date
Eike Ziller
bbfa7e0020 Merge app_version.h and ide_version.h 
Change-Id: I703d4704a3bdf88bd567c92512ee27db6aea043c
Reviewed-on: http://codereview.qt.nokia.com/3918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-08-31 13:48:00 +02:00
dt_
2cc7bea066 Remove BuildStepConfigWidget::init() 
It serves no purpose anymore.

Change-Id: Ifc15b29c7736bacde3b310e6c4dc980314145d14
Reviewed-on: http://codereview.qt.nokia.com/217
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-30 14:44:33 +02:00
dt
8e171e0be0 Qt Version refactoring 
Split up target specific code into subclasses. Also change
Qt4BuildConfiguration to allow a null qtversion.

Remove code that relied on always having a qt version.
Also make it possible to remove all qt versions.

Completly change the qt in path autodetection to be only
a fall back if no configuration was found.

Note: For now the old settings are not removed, as such 2.2 and master
can coexist.

Reviewed-By: hunger
 2011-05-12 12:23:06 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Oswald Buddenhagen
45c9cf7a12 add/unify i/o error handling 
lots of use of Utils::FileSaver and Utils::FileReader

Task-number: QTCREATORBUG-1619
 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
Bill King
5e372a165f Merge branch '2.2' 
Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
 2011-04-05 16:43:24 +02:00
Pawel Polanski
4254d6ed34 Symbian: crashes if canceled in a certain moment of package creation 2011-04-04 17:03:36 +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
Friedemann Kleint
88f333267f Fix Krazy code scanning tool warnings (QString, loops, spelling). 2011-02-25 15:28:01 +01:00
Friedemann Kleint
f37d9b55aa L10n: First round of tr()-Fixes for 2.2 2011-02-14 16:37:20 +01:00
Pawel Polanski
d6f9000451 Symbian: Passive content projects are deployed correctly. 
Task-number: QTCREATORBUG-3579
 2011-01-24 15:38:38 +01:00
Friedemann Kleint
edb4893547 Header cleanup in src, specify module name. 2011-01-24 12:29:48 +01:00
Friedemann Kleint
c41d9412aa Symbian: Fix runtime warnings. 2011-01-24 09:48:11 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Pawel Polanski
057591e0dd If capabilities inside pro files do not match the dev cert an error is generated (SymbianOS) 2010-12-14 16:37:50 +01:00
Pawel Polanski
75bd87e073 Some small fixes to cert management 2010-12-14 13:02:46 +01:00
Pawel Polanski
3ed119f103 'Certificate details' dialog added to SymbianOS 2010-12-14 08:45:12 +01:00
Pawel Polanski
993771f04c Capabilities and IMEIs can now be extracted form Dev Certs for SymbianOS 
Reviewed-by: Alessandro Portale
 2010-12-14 08:45:11 +01:00
dt
95d7639bb7 Qt4: Move Qt4Target and Qt4BC out of the Internal namespace 
Reviewed-By: hunger
 2010-12-07 13:16:07 +01:00
dt
68d6bfe33b Output parsers: Make target specific code pseudo generic 
Introduce IOutputParser::setWorkingDirectory and
IOutputParser::hasFatalErrors()

Reviewed-By: hunger
 2010-12-06 14:15:06 +01:00
Pawel Polanski
d6d830f593 If the cert file for Symbian is defined the initial location of key file is the cert's folder 2010-12-06 12:00:44 +01:00
Pawel Polanski
2277a750fd Certificate validation added to Symbian's signing process 
Reviewed-by: Tobias Hunger
 2010-12-02 16:43:02 +01:00
Pawel Polanski
474fecb69c Extra certificate extensions have been added to the file selection dialog for SymbianOS 2010-12-01 14:06:54 +01:00
Tobias Hunger
dbcbeaf6dc Fix warning on styling I got on commit 2010-11-24 17:41:13 +01:00
Tobias Hunger
96cd834fbb Symbian: Warn when patching sis files 
Wharn when qmake patches sis files to make them compatible with
self-signing.

Task-number: QTCREATORBUG-2403
Reviewed-by: Pawel Polanski
 2010-11-24 17:39:47 +01:00
Tobias Hunger
41e865f008 Rename SignsisParser to S60CreatePackageParser 
Reviewed-by: Pawel Polanski
 2010-11-24 17:22:16 +01:00
Pawel Polanski
a6cfa0ca45 Added cert filter for SymbianOS 2010-10-19 11:45:39 +02:00
Pawel Polanski
d5aabcff5d Simplified key selection for Symbian while choosing cert-key file pair 
Reviewed-by: Tobias Hunger
 2010-10-19 11:20:33 +02:00
Pawel Polanski
e0ec2ac82e Cleanup for SymbianOS 2010-09-30 14:15:50 +02:00
Pawel Polanski
67ff313ceb Added support for not signing packages for Symbian OS 
Reviewed-by: Tobias Hunger
 2010-09-30 14:13:00 +02:00
Leena Miettinen
e779886ab0 UI text - fix capitalization 2010-09-21 17:19:50 +02:00
Friedemann Kleint
f4b2a70edc L10n: tr-Fixes. 2010-09-14 14:57:36 +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
Tobias Hunger
26f5aaef8f Explicitly initialize signing mode 
* Explicitly set signing mode to SelfSigned if not mentioned in the
   .user file
 * Do not use c-style casts.
 2010-09-07 12:58:43 +02:00
Tobias Hunger
616a9b13f0 Enable restoring the default names of project configuration items 
* Enable support for this in all ProjectConfiguration items
   (Targets, projects, BCs, DCs, RCs, etc.). This is nicer
   than having custom code in individual configuraiton items.

Reviewed-by: dt
 2010-08-24 16:04:51 +02:00
Tobias Hunger
6311f0f99f Add parser for sbsv2 (new Symbian build system) 
* Add parser
 * Use it
 * Improve parser setup in Qt4 makestep
 * Add tests for the sbsv2parser
 2010-08-11 15:41:54 +02:00
Pawel Polanski
8e2c274d53 Application is not launched if an error occurred during deployment for Symbian OS 
Reviewed-by: Tobias Hunger
 2010-08-05 15:44:22 +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
Pawel Polanski
f4b1c441aa Added the SignSisParser for Symbian OS 
Added support for passphrases for keys for Symbian OS

Reviewed-by: Tobias Hunger
 2010-07-30 15:24:16 +02:00
dt
05ae17eadd Fix subdir project deployment for symbian 
We create a .sis package per leaf project now, deploy all of them and
start the executable for the runconfiguration that was selected. This
does not cover all use cases, but works for development.
 2010-07-26 19:44:07 +02:00
Friedemann Kleint
e8c0d0c162 Yet another include purging spree. 2010-07-13 16:36:37 +02:00
Tobias Hunger
b87f3fbcc8 Use outputparsers when creating S60 packages 2010-07-07 16:44:57 +02:00
Tobias Hunger
54584044ca Add Deploy steps 
* Add "Deploy" to BuildSteps::Type
 * Update UIs to handle deploy steps
 * Turn existing package creation steps from build type to deploy type
 * Move packaging steps into deploy steps when loading projects

Reviewed-by: dt
 2010-07-06 18:36:32 +02:00
Tobias Hunger
8ccbd0ec6b Rename StepType to BuildStep::Type 
* Move and rename the enum
 * Add Q_ENUMS macro

Reviewed-by: dt
 2010-07-06 18:36:30 +02:00
con
7d76940af7 Take the right sis package when using the Smart Installer flag. 2010-05-21 14:18:37 +02:00
con
38f6379f39 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
 2010-05-17 17:40:40 +02:00
Leena Miettinen
cf233161fa Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules. 
Reviewed-by: ossi
 2010-05-14 15:53:56 +02:00