Commit Graph

27 Commits

Author SHA1 Message Date
Thiago Macieira
272e9a37f3 Don't build mdnssd
This was enabled for Linux only, but Linux users should use Avahi,
which is present on most modern distributions, and implements mDNS
functionality.

Change-Id: Ibb9d16c9fbd5c2571b98e1450276459d18eb65df
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-07-02 12:51:57 +02:00
Orgad Shaneh
e99c139352 qbs project: Add RC file for app
Task-number: QTCREATORBUG-7224

Change-Id: I146dc2251b14b3a126093f7ecf29049c8c04750a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-25 12:10:40 +02:00
Yuchen Deng
0d20c5b796 Fix qbs code style
Change-Id: Ia3e4df528d391580064efbeeab75016335a4299d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-19 11:22:40 +02:00
Orgad Shaneh
3d69cd9be1 qbs files: Place libraries in lib/qtcreator
That's where qmake builds them.
To get even closer to qmake, on Windows platforms libraries should
also be built in lib/qtcreator, and then copied to bin (dll only,
no artifacts)

Change-Id: I00c41f88fe2b8365b27499ccdecd391fa419894b
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-19 11:14:38 +02:00
Orgad Shaneh
8a447e0c2a qbs files: Add QtcDebugger tool
Change-Id: I020307941dd5844e3f8b9091bba3e19b61b366ee
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2012-06-11 18:00:51 +02:00
Joerg Bornemann
02d72213b8 fix qtcreator.qbp
Change-Id: I2f9ec5885948f1dab10669fcbf0bcc326c60830a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-11 07:25:05 +02:00
Orgad Shaneh
4a0a7d8801 qbs files: Add qtpromaker tool
Change-Id: If13caf1eac00c786830c3237da7677fe13f50c56
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-11 07:21:05 +02:00
Orgad Shaneh
f29d9a60c4 qbs files: Add AutotoolsProjectManager
Change-Id: I9976f8328c04f95d08e0603f40915058f62fa63f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-11 07:15:54 +02:00
Orgad Shaneh
5f03e0260b qbs files: Add process stubs
Task-number: QTCREATORBUG-7233

Change-Id: I5255a41f0a6198e4c8c7e6022c97618937ef1790
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-24 17:05:20 +02:00
Christian Kandeler
53a1087d13 Move SSH support into a dedicated library.
It does not belong into libUtils, which is a collection of small
unrelated utility classes.

Task-number: QTCREATORBUG-7218
Change-Id: Id92b9f28678afec93e6f07166adfde6550f38072
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-22 10:51:53 +02:00
Christian Kandeler
0d6c47e447 Start adding qbs support for src/tools.
Change-Id: I70b9f13c6dffa107b12eac09ed4495a5318fdb1e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-05-21 12:35:29 +02:00
Kai Koehne
7f09d0b756 Merge QML inspector into debugger plugin
Merge QmlJSInspector plugin into the debugger. Also merge the
extra Inspector window with the Locals & Watchers: It now shows
the QML object tree in the running state.

Change-Id: I59ae0c1b970a48ba10ecda92ed3ba765d94b1d9c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-09 12:42:44 +02:00
Christian Kandeler
f26f65d319 Fix qbs build.
- Bump Creator version.
- Add missing dependency to resource editor.

Change-Id: I9337d916ec765ad7b299aaa78c24e6c75afd74f5
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-05-08 12:57:07 +02:00
Eike Ziller
529c0a8fe2 Merge remote-tracking branch 'origin/2.5' 2012-05-07 15:18:39 +02:00
Orgad Shaneh
de7b29d917 qbs project: Version bump
Change-Id: Ic2766f8db298fd2065facfebf0db38ed14938ed6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-03 15:47:40 +02:00
Eike Ziller
71d9f33bef Merge remote-tracking branch 'origin/2.5' 2012-04-26 07:06:04 +02:00
Daniel Teske
f3b2ca7d19 Add qbs files for android
Change-Id: I1739879579245303795fc7c6d5bc2206ffb44bcb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-25 15:57:48 +02:00
Orgad Shaneh
537af056cf qbs files: Set consoleApplication by debug mode
Debug build has console, release doesn't

Task-number: QTCREATORBUG-7224
Change-Id: I518da8460218236652f856f1e25c517769090e75
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-24 18:28:55 +02:00
Kai Koehne
4d3395b990 QmlDebug: Rename library and (most) classes
Rename the QmlJSDebugClient lib to QmlDebug (shorter names, easier differentiation with the shared/qmljsdebug lib).

Also rename
 - QDeclarativeDebug* classes to QmlDebug*
 - QDeclarativeOutputParser class to QmlOutputParser

To clarify the features,
 - Debugger::QmlDebuggerClient is now Debugger::BaseQmlDebuggerClient
 - QmlEngineDebugClient is now BaseEngineDebugClient
 - QmlDebuggerClient is now QmlEngineDebugClient
 - QDeclarativeEngineDebugClient is now DeclarativeEngineDebugClient

Change-Id: Ie15713730a614c8ab4b637fad0924f95b54e633f
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-04-18 14:31:36 +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
Orgad Shaneh
06aa0363b0 Qbs: Libraries capitalized and relocated in bin on Windows
Change-Id: I994027ef50f5f7c4ff1b2bef06d9f8db037243e4
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-04 14:16:12 +02:00
Joerg Bornemann
fab7b2970d qbs files: build QmlDesigner plugin
Change-Id: I850b2be8431803aac9d41fcaf40c89e6a1dd5a2c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-02 10:56:47 +02:00
Joerg Bornemann
f3bbbaeef6 qbs files: fix install location of qtcreator.sh
Change-Id: I6cb039c41d62f1b7b48613b22d4faa9d24d98278
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-30 16:01:54 +02:00
Joerg Bornemann
fbf6bc5530 qbs files: Version bump.
Change-Id: I6675e8dc58a80e37b3c0cfffab0c9d70d83ea91a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-03-29 14:29:57 +02:00
Orgad Shaneh
6abe727306 Todo: Add qbs file
Change-Id: Iefe74dff6663e14dc047146bbc92a9ad42ce0131
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-02-27 19:30:08 +01:00
Christian Kandeler
2f86d5c336 Zeroconf: Add qbs project file.
Change-Id: I1c0fa6cd7a77bab87c41cfa15eb7d4ceb93a697b
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-02-27 15:15:13 +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