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

69 Commits

Author SHA1 Message Date
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
Kai Koehne
7f1f9e14af Fix crashes when loading large .qmlproject's (Mac OS X) 
There is a hard limit on the number of file handles that can be open at one point per process on Mac OS X (e.g. it's 2560 on Mac OS X Snow Leopard Server, as shown by ulimit -a). Opening one or several .qmlproject's with a large number of directories to watch easily exceeds this. The results are crashes later on, e.g. when threads cannot be created any more.

This patch implements a heuristic that the file system watcher used for .qmlproject files never uses more than half the number of available file handles. It also increases the number from rlim_cur to rlim_max - the old code in main.cpp failed, see last section in

 http://developer.apple.com/maac/library/documentation/Darwin/Reference/ManPages/man2/setrlimit.2.html

for details.

Reviewed-by: ckamm
Task-number: QTCREATORBUG-1487
Task-number: QTCREATORBUG-1486
 2010-05-28 14:14:42 +02:00
Lasse Holmstedt
425f4b7467 Fixed crash when using -noload to disable multiple plugins 
The noload behavior is also changed: it now always shows the plugins in
About Plugins... menu, even though -noload was used. When using -noload,
the enabled state of the plugin is not saved, so if the command line
arg is removed, the plugin will be loaded normally.

Reviewed-by: con
 2010-05-12 14:38:52 +02:00
Lasse Holmstedt
bf518ba841 remove startup error messages from plugins that are disabled by user 
User can still see errors in About Plugins for disabled ones, too

Reviewed-by: mae
 2010-04-12 12:52:00 +02:00
Lasse Holmstedt
68c49a65e9 Plugin manager for enabling/disabling plugins 
Go to About Plugins and enable/disable plugins from there.

Reviewed-by: mae
 2010-03-12 16:02:42 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Daniel Molkentin
2c00799393 Port RSS fetcher to QNetworkAccessManager. 
Reviewed-By: Alessandro Portale <alessandro.portale@nokia.com>
 2010-02-18 17:36:49 +01:00
Daniel Molkentin
56aac18bd8 Extend QSettings workaround to Windows. 2010-01-21 21:28:09 +01:00
con
00142e4cf4 Work around a Mac specific QSettings bug for the moment. 2010-01-14 18:12:40 +01:00
con
ba31cfa505 Fix the path for global configuration. 2010-01-14 16:37:40 +01:00
Daniel Molkentin
88e24a61d6 Force system scope for settings to be in $CREATORDIR/share/qtcreator. 
Note that according to QSettings design, the file itself then is
in $CREATORDIR/share/qtcreator/Nokia/QtCreator.ini. Note case (Unix)
and Vendor dir!
 2010-01-14 15:27:09 +01:00
Daniel Molkentin
f093025ff3 Make it possible to override the language settings in Creator. 
Platform-dependent behavior is not good enough for a lot of
people it seems.

Reviewed-By: con
 2010-01-05 16:40:20 +01:00
Friedemann Kleint
bd8d2b0b8a Debugger: Enable attaching with -client option. 
Make it possible to trigger a debug-attach in a running instance
of Qt Creator by means of -client, use that in qtcdebugger, thus
enabling it to attaching to crashing executables in run mode
(Windows/CDB).

Modify IPlugin and application so that the complete command line is
serialized and transmitted to a running instance via QtSingleApplication
if -client is specified. Introduce IPlugin::remoteArgument and use that
in core for opening files and in the debugger for attaching.

Use -client in qtcdebugger with some logic to keep it alive as long as
the debuggee, make CDB break in that case as the events are not replayed
correctly in case the debugger is not spawned by the registered handler.
Rubber-stamped-by: con <qtc-committer@nokia.com>
 2009-12-14 18:01:39 +01:00
con
8ad31cba42 Remove some unused code. 2009-10-15 12:21:41 +02:00
Oswald Buddenhagen
5a482ace9a no contractions, please. and loosers are losers. :D 2009-09-29 12:18:43 +02:00
Oswald Buddenhagen
c7ad4adeea report plugin loading problems to the user 2009-09-29 12:18:42 +02:00
con
96b938e3fa Remove the "grab system language" hack for the Mac. 
It's now fixed in Qt, adb6eea3a135707a220c0b1c1cf8266321af9309.
 2009-09-15 14:22:12 +02:00
con
3d4c7abf9d Unnecessary code. 
Don't ask how this could still be there ;)
 2009-09-11 14:53:51 +02:00
con
1a0134a9de Use systems preferred language on Mac. 
And ensure that the menu items don't vanish from the application menu
when they are translated.
 2009-09-11 14:40:59 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Robert Loehning
f4ec27cdc2 Using QLatin1Char for directory separators in getPluginPaths() 
Reviewed-by: dt
 2009-07-24 12:11:12 +02:00
Robert Loehning
8eeabae49d Converting plugin paths to native format only for displaying. Using '/' as separator until then, regardless of OS. 
Reviewed-by: hjk
 2009-07-23 17:04:51 +02:00
Robert Loehning
5e653c3d25 Changing plugin paths to native separators to avoid showing messages with mixed 
separators / and \ on Windows.

Reviewed-by: Friedemann Kleint
 2009-07-23 14:09:04 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
Daniel Molkentin
bebb155925 Also search for Qt tr cataloges in the Creator tr dir. Add qt_help cataloge. 
The qt_help cataloge is required to fully translate the help plugin. The
additional lookup is mandated by the binary packages, where the translations
are simply put in Creatrors translation directories and the Qt translation
path is invalid.

Reviewed-by: con <qtc-committer@nokia.com>
 2009-06-10 13:30:41 +02:00