Commit Graph

523 Commits

Author SHA1 Message Date
Orgad Shaneh
a00b291484 qbs files: Sort files
Change-Id: I6514deb70162bd52687e6143813bcf1325a797db
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-03 09:26:34 +02:00
Orgad Shaneh
192bd214c7 qml files: Use buildDirectory as includePath for app_version_header
Add some missing app_version_header dependencies

Change-Id: Ieaa16e9a1bdace9032ef78a3329dfac60d28e99a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-10-01 17:37:26 +02:00
Eike Ziller
a55d47544a Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.qbp
	src/plugins/qtsupport/baseqtversion.cpp
	src/tools/tools.pro

Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
2012-09-26 10:01:04 +02:00
Christian Kandeler
a6d50b6e12 Help: Prevent moc from running on helpviewer_qwv.cpp.
If Webkit is disabled, moc will run on the file anyway, because there is
a ".moc" included and moc does not know about #ifdefs. This results in
an ugly warning ("no output generated") being emitted in the no-Webkit
case.
Solve the problem by moving the declaration of the QObject subclass into
the header file.

Change-Id: I2abaffd85a342fa2f3dbaa7bcf3ef63a2972c73e
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-25 15:38:48 +02:00
Christian Kandeler
6d06d47a6e Do not use qMemSet and qMemCopy.
They are deprecated in Qt 5. Call std::memset and std::memcpy instead.

Change-Id: I53c22283208b4d6fdfcba870c3b141f3c02001bd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-09-21 15:40:27 +02:00
Christian Kandeler
2b293691aa Do not use qFindChild() and qFindChildren().
These are deprecated in Qt 5 and can be trivially rewritten using
a construct compatible with Qt 4 as well.

Change-Id: I9cb9ab8b7b4ee75c7510ec2648b69dd204c87da4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-09-20 17:18:51 +02:00
Christian Kandeler
1b3d637c1b Replace qVariantValue() with qvariant_cast().
qVariantvalue() is deprecated in Qt 5. qvariant_cast() does
the same thing and works in Qt 4 and Qt 5.

Change-Id: I922329d3a47fe394669f5d97a25f0825d3d2dea5
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-20 09:41:37 +02:00
Eike Ziller
b947861c59 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
2012-09-19 18:02:46 +02:00
Eike Ziller
a5e4c2925a Fixes: Qt Creator documentation is accumulated
Deregistering the old documentation must be delayed till the help engine
is set up, because otherwise the list of registered namespaces is empty.

Task-number: QTCREATORBUG-4605
Change-Id: I08288129fe24a80b7af090c3aa5dd13395bc6093
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-09-18 10:25:01 +02:00
Christian Kandeler
40d919eed8 Support built-in testing infrastructure with qbs build.
I.e. define WITH_TESTS for debug builds or if the respective
environment variable is set.

Change-Id: I2764ece50d0783e8cb030b1695e6f59cf6063248
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-09-13 10:46:51 +02:00
Montel Laurent
f3649ce4d0 remote help: fix enable/disable button when we have selected item
Change-Id: Ibfed62844b729eb5a4fee32ff0d1c575b722dacd
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-30 09:29:37 +02:00
Oswald Buddenhagen
6529e874e4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/remotelinux/deploymentinfo.cpp

Change-Id: I92af9f9f558a76db78f838b0ccdfb8ad3d47af25
2012-08-28 15:13:32 +02:00
Jarek Kobus
4c96bd6791 Fix source strings
Change-Id: Ib56082091a1f7e3062ff48e981bb4ee8e2dd9357
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-28 14:16:10 +02:00
Christian Kandeler
e669f05406 Utils: Introduce HostOsInfo class.
The class' member functions are intended to be used
instead of the Q_OS_* macros in all contexts where
the latter are not syntactically required.
This lowers the likelihood of changes made on one
platform breaking the build on another, e.g. due to
the code model missing symbols in #ifdef'ed out code
when refactoring.

Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-27 17:00:03 +02:00
Friedemann Kleint
f03a76e1ca Fix qmake-warnings in Qt 5.
Use QT += help, designer, clean up Designer include hack.

Change-Id: I630cc7575d541ba4dc6c5cbecd335dbb8167e1c9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-30 15:28:29 +02:00
Konstantin Tokarev
16cf161d82 Changed URL to qt-project.org in pluginspecs.
Also, it's 2012 now.

Change-Id: I69a8d1d77658b2bb2cb547362d5e3163385cab3b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-30 07:44:48 +02:00
Friedemann Kleint
455b677f8e tr()-fixes for 2.6
- 'profile' -> 'target'.
- 'qt version' -> 'Qt version'. Fix occurrences in comments as
  well to make grepping easier.
- Placeholders.

Change-Id: I451eae2f0571bccf1e75cf0def425a09fa80855b
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-26 16:14:42 +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
hjk
b44e0e1a23 use QT_BEGIN_NAMESPACE instead of QT_FORWARD_DECLARE_CLASS
Less confusing to the highlighter.

Change-Id: I1c5f232da42b18d43f6c14b5907eb8feb48de2b4
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-17 17:17:31 +02:00
Yuchen Deng
5252fa4567 qbs files: Enable 'Help' plugin for Qt5
Change-Id: Ib8c7692984eae2d4b9e865837f4ef6970524a87f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-21 14:16:24 +02:00
Eike Ziller
b2e566662b Mac: Sanitize shortcuts.
Task-number: QTCREATORBUG-7446
Change-Id: Ibad8f06e5f65bc01dc9fca6e9d900e24c5fc55a1
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-06-11 13:39:20 +02:00
kh1
d3f3ab0115 Fix crash whith external help open.
Running the external window will take down the central widget as
well, cause calling m_externalWindow->setCentralWidget(m_centralWidget)
will pass ownership to the window. Calling delete on the central
widget inside the plugin constructor will crash, so set it to NULL.

Change-Id: I88ddde68a1ca3a47182de7c19847808738431149
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-06-05 11:54:31 +02:00
kh1
9eed55f3fb Change the font of the help, just size can be modified.
This is true for html files that are styled thru style sheets.
We could implement a workaround using jQuery and manipulate
the html/ css, but this is so slow that I won't do that.

Instead add a note and tell the user about the underlying problem.

Task-number: QTCREATORBUG-4871
Change-Id: Id3d0a490bb160825ec643f8c84871aad6cf1b796
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-05-31 16:18:01 +02:00
kh1
8d37120edc Fix font size was not applied at the first start of help system.
Used the wrong call to do this, there is a similar function that
should have been used.

Task-number: QTCREATORBUG-6762
Task-number: QTCREATORBUG-7195
Change-Id: Ic2317eda1c8d45006641b64507d08efb48e7e5a2
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-05-31 16:06:36 +02:00
kh1
3a3433f7e7 Fix cannot add help file if other file of the same version was removed.
Task-number: QTCREATORBUG-6678

Change-Id: I21ac494d7d666ef43f612b7ef49b92954f535ae8
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-05-31 14:56:16 +02:00
kh1
e1e65f6e56 Skip calling set custom value if nothing has changed.
The call will trigger a setup of the local help manager,
which is rather heavy and should be avoided if possible.

Change-Id: I03fbe6a30fba6ac48361c7e2b5aa6d45dad5126b
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-05-31 14:55:58 +02:00
Eike Ziller
3934347fe9 ActionManager API cleanup.
d-pointer instead of inheritance
static methods

Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-25 10:08:24 +02:00
kh1
ba185b8336 Make sure we call stop before removing a page.
Fixes a spinning cursor in case the page was not fully
loaded and we where closing it at the same time.

Change-Id: Iae6efac70c0c8be2f84e6b1551275bbdf9c5aab3
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-05-24 21:43:36 +02:00
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