summaryrefslogtreecommitdiff
path: root/src/app
Commit message (Collapse)AuthorAgeFilesLines
* Changed return type of :ICore::mainWindow() to QWidget*Konstantin Tokarev2012-07-191-1/+0
| | | | | | | | Also removed all <QMainWindow> includes which are not needed anymore. Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4 Reviewed-by: hjk <qthjk@ovi.com>
* Contact -> qt-project.orgEike Ziller2012-07-192-6/+2
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix cross build use mingw-w64 for WindowsYuchen Deng2012-07-051-7/+7
| | | | | Change-Id: Ie808c819fb0a26f9b846d2dcc3a04c2096626dc4 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Make PluginManager mostly static.Eike Ziller2012-06-191-25/+26
| | | | | Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228 Reviewed-by: hjk <qthjk@ovi.com>
* Fix default ui language on Linux.Eike Ziller2012-05-311-1/+2
| | | | | | | | 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>
* Work around uiLanguages crash on Windows with 4.8.0Eike Ziller2012-04-051-1/+2
| | | | | | Task-number: QTCREATORBUG-721 Change-Id: I159c4ef85eba1eda9f3b7e3a001dd6991d578ffe Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
* Fix Qt Creator using wrong UI language.Eike Ziller2012-03-271-14/+28
| | | | | | | | | | | 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>
* year bumpEike Ziller2012-03-121-1/+1
| | | | | Change-Id: I81072f3a16db42417e598a07737351b28227042c Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-18/+18
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Add a new option to main.cpp to specify a specific pid.Adam Treat2012-02-101-15/+33
| | | | | | | | | | | | | | | | | | | | 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>
* Long live the king!hjk2012-01-262-2/+2
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Doc: Location where "local" data is saved (e.g. compiled helpers).Eike Ziller2012-01-131-1/+1
| | | | | | Change-Id: I21ccfd58cbcaae6231b88d3a9039eb413f4be1c2 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* Allow build to specify different settings path.Eike Ziller2011-12-162-3/+15
| | | | | | | | 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>
* Fix windows proxy setting again.Eike Ziller2011-12-081-2/+4
| | | | | | | Broke with 4edec9f9. Change-Id: I1dfad5964f7d36566de0874d19e7ca94e3b92054 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-112-4/+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
| * all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-032-4/+4
| | | | | | | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-10-281-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '2.3' into 2.4Oswald Buddenhagen2011-10-181-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/commonoptionspage.ui src/plugins/madde/maemoqtversion.cpp src/plugins/projectexplorer/runsettingspropertiespage.ui Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
| | * Fixed some typos and added some missing ellipisesJure Repinc2011-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Make it possible for installers to disable plugins by default.Eike Ziller2011-10-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Coding style fixesYuchen Deng2011-10-221-27/+23
|/ / | | | | | | | | Change-Id: I524be1971d812c865f10922dc402b7c98b7a16e8 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Add missing command line help.Eike Ziller2011-10-141-1/+1
| | | | | | | | | | Change-Id: Ib1f98fa91293478d0f4271f9032e6e3866c81bab Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Add include guards for generated file app_version.h.Daniel Molkentin2011-10-111-0/+5
| | | | | | | | | | | | | | Change-Id: I3ad01e47d2a76159b1369330246b23ed03120597 Reviewed-on: http://codereview.qt-project.org/6361 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Remove unused parameter.Eike Ziller2011-10-071-2/+2
| | | | | | | | | | | | Change-Id: I0aaedd0b7e880d9ace97bf357cd9924247558f0f Reviewed-on: http://codereview.qt-project.org/6227 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Commit things that went missing from 2a4a56b2beec7a3c0be94302146461d2f730315dEike Ziller2011-10-061-12/+12
| | | | | | | | | | | | | | 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>
* | Load plugins from user config directory too.Eike Ziller2011-10-051-3/+16
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge app_version.h and ide_version.hEike Ziller2011-08-312-1/+73
| | | | | | | | | | | | | | 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>
* | Reduce the directories plugins are searched inDaniel Teske2011-08-311-1/+4
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Show more useful error dialog in case of plugin errors.Eike Ziller2011-08-291-10/+5
|/ | | | | | | | | 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>
* Fix Windows resource file qtcreator.rc.Friedemann Kleint2011-07-261-7/+7
| | | | | | | | | Use \\. Change-Id: I63822a79cb6593111b39996c39d774434e291893 Reviewed-on: http://codereview.qt.nokia.com/2175 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Introduce QML-based welcome screen using desktop componentsDaniel Molkentin2011-06-291-1/+5
| | | | | | | | | 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>
* Add qml icon to the windows ressourcesdt2011-05-121-0/+1
|
* Krazy fixes (spelling, single char strings, char constants).Friedemann Kleint2011-05-101-10/+10
|
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Merge branch '2.2'Oswald Buddenhagen2011-04-141-14/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update license.hjk2011-04-131-14/+13
| |
* | Merge remote branch 'origin/2.2'con2011-04-011-3/+6
|\ \ | |/ | | | | | | | | | | | | | | | | 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
| * Workaround for Mac users with automatic proxy configurationcon2011-03-301-3/+6
| | | | | | | | | | | | | | | | | | 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
* | App: Ask the user if creator -client can't send a messagedt2011-03-241-6/+23
|/ | | | Task-Nr: QTCREATORBUG-3980
* Pluginmanager: Test if there are tests to run, if so, then quit when done.Bill King2011-02-171-1/+4
| | | | | 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.
* Do not run tests by defaultDaniel Molkentin2011-02-161-1/+1
| | | | Requested-By: hjk
* Merge remote branch 'origin/2.1'con2011-01-241-1/+1
|\
| * Fix the manual proxy hack for Linux so it works with HTTPSDaniel Molkentin2011-01-201-1/+1
| | | | | | | | Reviewed-by: con
| * It's 2011 now.con2011-01-122-2/+2
| |
* | It's 2011 now.con2011-01-122-2/+2
| | | | | | | | Reviewed-by: hjk
* | Merge branch '2.1'con2010-12-171-7/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * License headers.con2010-12-171-7/+11
| |
| * Version bump.con2010-12-021-2/+2
| |
| * Version bump.con2010-11-021-2/+2
| |
* | Fix generation of Info.plist on Mac.con2010-11-122-6/+6
| | | | | | | | | | | | | | Since the move to Info.plist.in, Mac builds were missing their Info.plist, because the combination of QMAKE_INFO_PLIST and QMAKE_SUBSTITUTES doesn't play well. Moving to use QMAKE_SUBSTITUTES exclusively.
View Lorry Controller Status