feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
33,264 Commits 108 Branches 368 Tags
839a383aa3495c54f970db030aa254f4d915a276
Commit Graph

32 Commits

Author SHA1 Message Date
Eike Ziller
c7e877f10b Help: avoid opening external browser for 'no documentation available' 
Task-number: QTCREATORBUG-10513

Change-Id: I07af69fb5223faf5e030f30280ae3125731b79bc
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
 2013-10-30 11:22:38 +01:00
Eike Ziller
c7761d8b2e Help: Only open 'internal' documentation links in Qt Creator 
Open external webpages in external browser.

Task-number: QTCREATORBUG-8433
Change-Id: I760f6c5705046a6f8b7ebec3cd7b32253738e0df
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
 2013-10-18 12:32:21 +02:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
 2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
hjk
c0e7b65db3 Help: move global constants 
Global constants that are used only in one place could live
just there.

Change-Id: Ibee751b6ccc4fb0d35a8e708995730991becd749
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
 2013-01-11 12:19:41 +01:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Konstantin Tokarev
d18bf468ad Changed return type of :ICore::mainWindow() to QWidget* 
Also removed all <QMainWindow> includes which are not needed
anymore.

Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4
Reviewed-by: hjk <qthjk@ovi.com>
 2012-07-19 15:15:53 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
kh1
c1fbe9ddb1 Let the desktop system handle mailto links. 
Task-number: QTCREATORBUG-4058

Change-Id: If48f8150bc05418c3ac0b9e132b84ed7836e08fa
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-05-10 14:04:51 +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
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
hjk
4a21f0c3c8 Use new static ICore interface. 
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-24 18:48:47 +01:00
Eike Ziller
007330569b Fix loading files from within documentation. 
Task-number: QTSDK-1129

Change-Id: Ief29c41ad4074d74c97b4e8aa9c69a6e4a0d9d67
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-12-09 09:55:47 +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
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
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
dt
1c1acd0c4c Compile: include QApplication instead of QCoreApplication 
Reviewed-By: kh
 2011-01-11 15:00:23 +01:00
kh1
fd89e85850 Fix missing progress indicator during load. 
Task-number: QTCREATORBUG-3380
 2011-01-11 13:16:12 +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
kh1
71033d5d9a Specify the used charset, fixes e.g. polish translation. 2010-11-18 16:04:27 +01:00
kh1
0985f9c1c4 Fix ambiguity with help manager by renaming the file to match class. 
Task-number: QTCREATORBUG-3090
Reviewed-by: ck
 2010-11-16 16:25:55 +01:00
kh1
6c580fd71b Make sure we can open local files as well. 
Reviewed-by: ck
 2010-08-16 15:21:58 +02:00
kh1
7d4bbf4934 Allow http request to be opened in the help plugin. 
Reviewed-by: ck
 2010-06-14 14:34:32 +02:00
kh1
1b6ad08795 Move help manager into core. 
- lessens open file handles
 - improves help plugin startup further

Task-number: QTCREATORBUG-337
Reviewed-by: ck
 2010-06-11 13:11:37 +02:00
kh1
b0f9b1d491 We need to check for namespace nokia too. 
Reviewed-by: ck
 2010-04-28 15:07:05 +02:00
kh1
d086f76038 Improved workaround for new qt documentation, base on dboddie's work. 
Make the check more generic, to also work for all other Qt namespaces
than qt.ver.s.ion. Still there's something broken in Qt webkit or so.

Reviewed-by: ck
 2010-04-23 12:20:21 +02:00
kh1
e6900ff03d Just use the path as the url can have an anchor attached etc... 
Fixes the broken topic chooser and keyword resolving.

Reviewed-by: ck
 2010-04-20 16:17:29 +02:00
kh1
342e621253 Quick fix to make the documentation work, needs a proper solution though. 
Reviewed-by: kh
 2010-04-19 19:08:51 +02:00
kh1
6ea66ca3bd Implement a common interface for help viewers. 
Both implementations are now split into two source files, based on the
base class type. They share also a commen implementation, but the class
interface looks now clean to the outside. Adopt other classes for use.
 2010-03-30 17:51:44 +02:00