Commit Graph

844 Commits

Author SHA1 Message Date
kh1
b6b2441e55 Return a valid URL from a user supplied input.
Change-Id: If69577caa4a5a7ea024f80c8ac995807d6d14fbd
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-24 20:26:39 +02:00
kh1
a225799d25 Remove some unused code from central widget.
Change-Id: I07ee65ac438c20bb46803cdcc081e53b44834f4e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-24 20:24:55 +02:00
kh1
928adb5d6b Fix broken handling of unsupported mime types.
Task-number: QTCREATORBUG-2701
Task-number: QTCREATORBUG-4059

Enable plugins to support pdf, etc. files out of the box in
Qt Creator. If we still fail we try to open the link using
the desktop service, as last resort to open a page showing
some error message and hints about the error. Adjust the old
page not found message to match the new design.

Change-Id: I7fef79d27e8bc279a6169b6f3da4787ffa0d023d
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-05-23 12:08:22 +02:00
hjk
f77cd29e54 IOptionsPage: replace virtual fuctions by data members
Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-23 10:48:04 +02:00
Christian Kandeler
1558640ed6 Fix qbs build for help plugin.
Change-Id: Ie71eda809f98b76d32a92b86e6351996451ff4b5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-22 12:47:36 +02:00
kh1
e9b8d1f929 Remove some objects from the objects pool. Fixes race condition.
Since the central widget would access the local help manager in
its destructor, we need to handle deletion of the objects ourself.
The object pool would release it to early, thus we could never
write some settings back into the collection file.

Change-Id: Ib4e003214d9d0b32bee3922dd23d27624b5d110e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-15 15:34:00 +02:00
kh1
d762373b95 Make it possible to Show/Hide the sidebar in help mode.
Task-number: QTCREATORBUG-1533

Change-Id: I0ac767db5bcbda12a9d8ba1572ee75881308d0d0
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 15:14:07 +02:00
hjk
21bf0046c3 editormanager: simplify use of interface
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 13:51:14 +02:00
Eike Ziller
2359fe3610 Merge remote-tracking branch 'origin/2.5' 2012-05-11 13:41:04 +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
hjk
cad2966498 use Core::Id for IMode::id and IMode::type
Change-Id: Ic7ce5b883e054c6eeba078327042e99e1c556345
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-08 10:18:12 +02:00
Konstantin Tokarev
c6703af8f9 Removed code duplication and unused methods in IFindSupport derivatives.
Change-Id: I6c76665c88f2d4678858081765e29a08566798b1
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-07 08:36:27 +02:00
Bradley T. Hughes
fb9146a9c3 Compile after qt5/qtbase commit 75a0c7f9
Commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848 in qt5/qtbase changed
some QRegExp methods to be non-const (they were previously const). This
change makes Qt Creator compile again.

Change-Id: Ibc98c678126c3b3189df7fcc043463b940951445
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-30 14:32:08 +02:00
Marco Bubke
56cf850b21 Fix wrong names in the UI
Change-Id: I6635b3a91eed4d34bb477aaeac37709e15059e06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-04-18 13:32:57 +02:00
Joerg Bornemann
d6465142eb qbs files: build with Qt5
Help plugin and QmlDesigner have been disabled for Qt5.

Change-Id: I9345d0fd00f9a575333dc972cc7adbdf146cd6cb
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-10 18:03:37 +02:00
Joerg Bornemann
96a7fbe3ae qbs files: use Qt5 module dependencies
Renamed gui -> widgets.
Renamed declarative -> quick1.

With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported.

Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-10 18:02:39 +02:00
Friedemann Kleint
b7856be521 Help: Decouple BookmarksWidget from OpenPageManager.
Connect via signal to make it possible to build the shared help
code as a static library.

Change-Id: If4e9c8ee43eb32e08167c7642f52214643de6d5c
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-04-03 17:26:54 +02:00
Eike Ziller
63244127a8 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/libs/symbianutils/symbianutils.qbs
	src/libs/utils/utils.qbs
	src/libs/zeroconf/zeroconf.qbs

Change-Id: I4c888d8e58ec68dc4638b041b0c6ee743b809ab4
2012-03-29 17:58:34 +02:00
Tobias Hunger
d429dda774 Help: Do not get stuck with spinning cursor
Do not get stuck with the busy cursor spinning on windows whenever
a page is not found.

Change-Id: I4596b6ec0d3de4005bc60422e4fe19142600e336
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-03-28 16:46:35 +02:00
Eike Ziller
7931159c09 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/libs/qmljsdebugclient/qmlprofilereventlist.cpp
	src/libs/zeroconf/servicebrowser.cpp
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qmlprofilerengine.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.h
	src/plugins/qmlprofiler/tracewindow.cpp

Change-Id: Ib5e7579efffe74f2bf6871690d1e398e1062f986
2012-03-21 09:57:56 +01:00
kh1
126d0af4d6 Fix 38fe616d85
Obviously it helps to add the search term even if it does
not contain special characters.

Change-Id: If32e3e0b8b64fde99a3247dd6eee29928995591f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-16 16:26:38 +01:00
kh1
38fe616d85 Curly-braces in "Help -> Search for..." crashes Creator.
Task-number: QTCREATORBUG-6212

We need to escape special characters that are used inside the
search engine as field delimiter. As soon as the search engine
proccesses the search string it will remove the character and
we might end up with an invalid string, forcing it to throw an
exception thats not catched.

Change-Id: I8b66c87c3137a1f175ead5df85c7f53fdcb5193e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-16 16:03:21 +01:00
Eike Ziller
4b8df15f3d Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/plugins/remotelinux/startgdbserverdialog.cpp

Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
2012-03-08 07:48:55 +01:00
Robert Loehning
b41171c847 Normalized connect()s
Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-06 12:46:52 +01:00
Friedemann Kleint
4e83fb7953 Port Qt Creator to the new plugin system of Qt 5.
- Add Q_PLUGIN_METADATA for Qt 5, use Q_EXPORT_PLUGIN
  for Qt 4.
- Generate the Json files for Qt 5 from the pluginspec
  files by using a XSLT sheet.

Change-Id: I8653f182ae7d61615971c093df10b84fb06c2172
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-02 14:13:49 +01:00
Orgad Shaneh
164db0feeb qbs: Cleanup
* Removed utils, extensionsystem and aggregation dependencies
for plugins that depend on Core
* Capitalized Find and CPlusPlus

Change-Id: I505e5f46976f26da47ad778860f103b173668b1c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-02-28 08:58:11 +01:00
Joerg Bornemann
ff92cdec43 add qbs files
Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-20 19:18:18 +01:00
Eike Ziller
b1ff83013c More consistency for close & close split.
Change-Id: I3d0869d5fc2542ff59434e0d42dae0ce6c7a2391
Reviewed-by: Virva Auvinen <virva.auvinen@nokia.com>
2012-02-20 15:36:10 +01: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
Daniel Molkentin
25a767c760 Extend the CSS workaround in the helpviewer
The documentation now uses /doc instead of /qdoc.

Change-Id: If01ee02d236cb343f78e0c185a3e05620dac24ae
Reviewed-by: Michael Bruning <michael.bruning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-31 12:12:39 +01:00
hjk
2df4cb21fe Core::ModeManager: make some functions static
Change-Id: I5c1275ba3f596d8911fd2e4404181bf57b58f494
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-27 14:52:24 +01:00
Daniel Molkentin
b44e541dca bugreports.qt.nokia.com -> bugreports.qt-project.org
Change-Id: Ifc258886f7d6e7d5b02caae8994210aeef221554
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-01-26 19:58:08 +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
Morten Johan Sorvig
b0cd54c1ec Replace Q_WS_MAC with Q_OS_MAC.
We want to carry over all mac-specific code paths
to Qt 5. WS_MAC is no longer set; OS_MAC is.

This change is compatible with Qt 4 builds since
OS_MAC is set whenever WS_MAC is. (OS_MAC would
also be set for the theoretical X11/Mac platform,
but that's anyway not a supported configuration
for Creator)

Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-26 11:06:12 +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
9a0636f7a9 Merge remote-tracking branch 'origin/2.4' 2011-12-13 15:25:20 +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
Eike Ziller
bb057a6619 Whole-words searching doesn't work with QtWebKit.
So we turn it off.

Task-number: QTCREATORBUG-4706
Change-Id: Ib51740428db35a1697dd5bca0f8f58b7ffd5fb1a
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2011-11-29 18:00:28 +01:00
Friedemann Kleint
b0eff051c1 Add Qt 5 libraries to .pro files.
Make Qt Creator compile with Qt 5 after using fixqt4headers.pl.

Change-Id: I74ca51d562f49378b40103b79848f5dd3b11e77e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-24 12:02:30 +01:00
Tobias Hunger
0ce9fa2c16 UI files: Do not polute the global Ui namespace
Make sure all ui-files are in the plugin's internal namespace.

Change-Id: Ifb2c3093441e8feb89e46f52fbb386fc316cfd13
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-24 10:49:41 +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
Jarek Kobus
da14d86104 Implement context help for pro file editor
Task-number: QTCREATORBUG-6325
Change-Id: Ie8b2eb582eb527eac6af56d0c69a8ae1dafdc1df
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-10 16:55:11 +01:00
Harald Fernengel
f9623b5ad6 Small include header fixes
QtXmlStream classes live in QtCore, not QtXml. Also add a few headers
that are not implicitly included in Qt 5 any more. This greatly eases
transition to Qt 5 which not having any side effects on the Qt 4 build.

Change-Id: I1293ef4360015b885dcea8c4099e8e5b9e254c91
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-11-09 14:02:40 +01:00
Felix Geyer
28b920ecd4 Fix qreal is not double.
Change-Id: Ife56e908a67da70ebe5af223b19fc8b99fc3a1d2
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit 3b0f26e231)
2011-11-09 11:00:13 +01:00
Felix Geyer
3b0f26e231 Fix qreal is not double.
Change-Id: Ife56e908a67da70ebe5af223b19fc8b99fc3a1d2
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-09 10:05:44 +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
hjk
29279ab8c7 more style fixes of string literal access
Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-02 18:20:19 +01:00
Robert Loehning
db31112e8e Fixed dead initialization
Change-Id: I839a8478cd57e872fb5a145f095b3b57f25fdf11
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2011-10-20 21:42:31 +02:00
hjk
ace2b80602 help: Add '...' to indicate there will be another dialog
Change-Id: Ic884acf20f1d1a48f5306b380338fd0a99d63fa8
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit 6ae5065704)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-10-18 10:51:42 +02:00
hjk
7bfde77d7c s/error_message/errorMessage/g
Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710
Reviewed-on: http://codereview.qt-project.org/5312
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-21 13:06:52 +02:00