feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
55,647 Commits 108 Branches 368 Tags
cbd4d05423da34891abba5e0c7b51b646f3aa101
Commit Graph

193 Commits

Author SHA1 Message Date
Eike Ziller
e3c354d8f2 Make PluginManager mostly static. 
Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228
Reviewed-by: hjk <qthjk@ovi.com>
 2012-06-19 16:11:40 +02:00
Eike Ziller
6026a4a51c Fix default ui language on Linux. 
On systems where uiLanguages returns something containing "-"
(e.g. "de-DE", see QTBUG-25973)

Change-Id: Ibe2db6a7a6ed893795e3f3110b33c39225bed751
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-05-31 12:43:13 +02:00
Eike Ziller
2aa4b803a6 Work around uiLanguages crash on Windows with 4.8.0 
Task-number: QTCREATORBUG-721
Change-Id: I159c4ef85eba1eda9f3b7e3a001dd6991d578ffe
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-05 16:59:26 +02:00
Eike Ziller
575aa068fa Fix Qt Creator using wrong UI language. 
Qt 4.8 introduced QLocale::uiLanguages() and changed the behavior of
QLocale::system().name(). We now retrieve the list of preferred
uiLanguages when building against 4.8, and look for the first language
that we have translations for.

Task-number: QTCREATORBUG-7134
Change-Id: I90cdb6182732a013dc431b61a7976900e48e0d31
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-03-27 09:56:57 +02:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
Adam Treat
b5940e0fd6 Add a new option to main.cpp to specify a specific pid. 
Add a new option to main.cpp which allows the user to specify a specific pid to
use to open a new file and forwards all the arguments to that pid.  Required some
changes to QtSingleApplication, but I did not alter any existing API.  Just added
some new methods for querying an instance of a specific pid.

Together with some changes to the terminal plugin this will allow the user to open
any file with Qt Creator from within the terminal plugin by simply invoking the
qtcreator binary.  All that is necessary is the addition of an alias like so:

if [ -n "$QTCREATOR_PID" ] ; then alias qtcreator="/path/to/qtcreator/binary/qtcreator -pid $QTCREATOR_PID" ; fi

This is entirely analagous to what kate allows where you can open any file with
kate from within the embedded terminal.

Change-Id: I476d78d673ee60052a02eb974eefc5368d24193b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-02-10 10:28:58 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
Eike Ziller
61082af6af Doc: Location where "local" data is saved (e.g. compiled helpers). 
Change-Id: I21ccfd58cbcaae6231b88d3a9039eb413f4be1c2
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-01-13 13:07:53 +01:00
Eike Ziller
8cc3844038 Allow build to specify different settings path. 
Task-number: QTCREATORBUG-5509
Change-Id: I4541049a1861e83f55106effc536fd50eb233d97
Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-12-16 08:48:31 +01:00
Eike Ziller
b2c73f6e18 Fix windows proxy setting again. 
Broke with 4edec9f9.

Change-Id: I1dfad5964f7d36566de0874d19e7ca94e3b92054
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-12-08 11:59:40 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Eike Ziller
81cce8902e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
 2011-10-28 10:17:44 +02:00
Eike Ziller
2ee0b36342 Make it possible for installers to disable plugins by default. 
Plugin manager reads Plugins/Ignored in installation global settings
now, and handles these plugins similar to as if they were experimental.

Change-Id: I56a0c5fe143e3fbd9261244bafece26d7b99c154
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-10-27 18:20:40 +02:00
Yuchen Deng
d136b011e1 Coding style fixes 
Change-Id: I524be1971d812c865f10922dc402b7c98b7a16e8
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-22 20:02:25 +02:00
Oswald Buddenhagen
0164e1bea2 Merge branch '2.3' into 2.4 
Conflicts:
	src/plugins/debugger/commonoptionspage.ui
	src/plugins/madde/maemoqtversion.cpp
	src/plugins/projectexplorer/runsettingspropertiespage.ui

Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
 2011-10-18 13:50:38 +02:00
Eike Ziller
2a489d4d4d Add missing command line help. 
Change-Id: Ib1f98fa91293478d0f4271f9032e6e3866c81bab
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-14 08:21:25 +02:00
Eike Ziller
b44d3ad1ea Remove unused parameter. 
Change-Id: I0aaedd0b7e880d9ace97bf357cd9924247558f0f
Reviewed-on: http://codereview.qt-project.org/6227
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-07 10:42:59 +02:00
Eike Ziller
ae3a833b8c Commit things that went missing from 2a4a56b2be 
Change-Id: I16f0d8880003156722cd80fdc51b0f8f21a5bfae
Reviewed-on: http://codereview.qt-project.org/6120
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-06 09:52:22 +02:00
Jure Repinc
fa4db8d045 Fixed some typos and added some missing ellipises 
During translation into Slovenian I noticed some typos in original
string. For example some missing ellipsis characters and some
incorrectly spelled MeeGo names (as Meego)

Change-Id: I48eaa95303f1e82ab9893f713056382e8daaef41
Merge-request: 2200
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-10-05 20:14:59 +02:00
Eike Ziller
2a4a56b2be Load plugins from user config directory too. 
Also adapt the Qt Creator plugin template to make it
possible to choose between deploying locally or into
Qt Creator's build directory.

Change-Id: Ia8566a5034443bc9574a1593eddf0a89eb4d80b2
Rubber-stamped-by: Daniel Molkentin
Reviewed-on: http://codereview.qt-project.org/4178
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-05 18:32:10 +02:00
Daniel Teske
fb80782577 Reduce the directories plugins are searched in 
Don't search in the mac directories on linux/unix and vice versa.
Orginal patch by Ray Donnelly <mingw.android@laptop.com> on the android
branch.

Change-Id: I57a4d83a94f28bbe00609fd1b9170629da27334e
Reviewed-on: http://codereview.qt.nokia.com/3949
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-31 13:38:10 +02:00
Eike Ziller
c4ab643d76 Show more useful error dialog in case of plugin errors. 
Task-number: QTCREATORBUG-3940

Change-Id: I9e12ad68bba9c2f0d8f5243ab7dc763765fba756
Reviewed-on: http://codereview.qt.nokia.com/3811
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2011-08-29 16:49:52 +02:00
Daniel Molkentin
497dd323ea Introduce QML-based welcome screen using desktop components 
Implements new XML-based format for examples, demos & tutorials

Done-with: Primrose Mbanefo <ext-primrose.mbanefo@nokia.com>
Change-Id: I42c0afdb419cffe5637cd4f298e828d09e0fb15a
Reviewed-on: http://codereview.qt.nokia.com/840
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-06-29 00:31:47 +02:00
Friedemann Kleint
ddf4b613f3 Krazy fixes (spelling, single char strings, char constants). 2011-05-10 15:21:41 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +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
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
con
4edec9f92a Workaround for Mac users with automatic proxy configuration 
Qt's implementation for the Mac system configuration doesn't handle
automatic proxy configurations. Qt Creator now also looks at the
http_proxy environment variable on Mac as a workaround.

Task-number: QTCREATORBUG-4190
Reviewed-by: Daniel Molkentin
 2011-03-30 14:58:28 +02:00
dt
6f12c73a4f App: Ask the user if creator -client can't send a message 
Task-Nr: QTCREATORBUG-3980
 2011-03-24 17:09:15 +01:00
Bill King
9552e13c3c Pluginmanager: Test if there are tests to run, if so, then quit when done. 
Double testing, only enable the codeblock when tests are found to be run,
also, only send the quit message if there are tests found to be run.
 2011-02-17 11:37:34 +01:00
Daniel Molkentin
b83667058c Do not run tests by default 
Requested-By: hjk
 2011-02-16 23:03:35 +01:00
con
34f28a87ab Merge remote branch 'origin/2.1' 2011-01-24 14:01:04 +01:00
Daniel Molkentin
fa58c6742e Fix the manual proxy hack for Linux so it works with HTTPS 
Reviewed-by: con
 2011-01-20 13:29:36 +01:00
con
54f4fba003 It's 2011 now. 2011-01-12 15:34:06 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +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
con
060e230040 Add a -settingspath <path> command line option. 
Useful for testing.
 2010-10-25 18:02:46 +02:00
con
99a93dc2e3 Get rid of hardcoded settingspaths that need to be synced. 
Share the (user)settings object between plugin manager and Qt Creator
core.
 2010-10-25 17:21:28 +02:00
Daniel Molkentin
64f26d3f9b use http_proxy variable for proxy detection on linux 
Reviewed-by: con
 2010-10-21 18:35:28 +02:00
Denis Mingulov
3065b029e5 QApplication::aboutToQuit signal is used for the plugin manager's shutdown 
Merge-request: 179
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2010-09-27 14:59:22 +02:00
Friedemann Kleint
69736d7815 Revert "Use raster graphics on X11 by default" 
As it causes problems on standard-Linux installations.
See also QTCREATORBUG-2238.

This reverts commit 0e318bfcf5.
 2010-09-24 10:47:47 +02:00
Jens Bache-Wiig
0e318bfcf5 Use raster graphics on X11 by default 
This will be the default in Qt with 4.8. It is faster and
less prone to graphics issues than the X11 engine so we
should use it in Creator by default.

task-number: QTCREATORBUG-2238
 2010-09-21 15:06:52 +02:00
Roberto Raggi
efe3dc93d6 Increased the number of threads in the global thread pool. 
Reviewed-by: dt
 2010-09-13 11:55:38 +02:00
Marco Bubke
7aaaa75094 Add breakpad 
This is not activated if breakpad and qt-breakpad is not availiable.
 2010-09-09 19:37:01 +02:00
con
b3dbc4b4e4 Add flag to IPlugin::aboutToShutdown that allows asynchronous shutdown. 
If a plugin requests asyncronous shutdown, the shutdown sequence does
not continue to deleting the plugins before it has sent a
asynchronousShutdownFinished signal. During that time an event loop
is running.
 2010-07-13 15:25:21 +02:00
Robert Loehning
5bb23ade98 Revert "Work around a Mac specific QSettings bug for the moment." 
Workaround is no longer needed and causes trouble with cyrillic characters.

This reverts commit 00142e4cf4.
 2010-06-22 15:08:48 +02:00
Robert Loehning
8ef646beec Revert "Extend QSettings workaround to Windows." 
Workaround is no longer needed and causes trouble with cyrillic characters.

This reverts commit 56aac18bd8.
 2010-06-22 15:08:48 +02:00