Commit Graph

50 Commits

Author SHA1 Message Date
Orgad Shaneh
ad9e7ccab6 Fix coding style for else statements
Change-Id: I1309db70e98d678e150388c76ce665e988fdf081
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-17 11:11:25 +02:00
Eike Ziller
6b0be2d4a4 Revert "Fixing Info.plist.in for qmlobserver and qmldump"
The Info.plist.in files are actually handled by static.pro.
The projects should only be compiled from the deployed sources in the
build tree.

This reverts commit 30c602f458.

Change-Id: Ib63fb9e4db1c249817e59239029db7dd220ba5b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-06-28 14:22:45 +02:00
Thomas Hartmann
30c602f458 Fixing Info.plist.in for qmlobserver and qmldump
Since we use Info.plist.in we need QMAKE_SUBSTITUTES
and cannot use QMAKE_INFO_PLIST.
We manualy replicate the target logic.

Change-Id: I5b703d09db85457ba3bdadef97fd1cc2194b618f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-11 16:57:38 +02:00
Friedemann Kleint
3ec9d6bb64 Fix Krazy warnings about improper include guard in QML debugger.
Change-Id: I14be0beae7f678dc2fc8af4324c846d757d0cd9d
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-03-15 13:23:17 +01: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
Oswald Buddenhagen
f1cec4629e Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
2013-01-29 15:52:36 +01:00
Robert Loehning
a2ae912089 Fixed Qt version in qmlobserver
QT_VERSION_STR is being read from Qt's source directory
and may differ from the version of the build being used

See also printVersion() in src/app/main.cpp

Change-Id: Ib740c07136e1549b0cbecc8258889688763b0b36
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-01-28 12:22:10 +01:00
hjk
6313351d21 QmlObserver: remove Symbian specific code
Change-Id: Ic28d81daaa3b8378730fb5ea3810af7d748b54ba
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-11 13:50:00 +01:00
Eike Ziller
4f0b90dd43 Fix remaining URLs and a few other things that still referred Nokia
Change-Id: I1c85bae3a1ada7a281fedd6951b35e6a4da395e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-09 11:10:50 +02: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
Alessandro Portale
ae23d50576 Removal of Symbian support
Qt Creator's support for Symbian was at its peak in version
2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6.
It is most likely rotten. Let's remove it!

Also, the Symbian support code was spread throughout the whole
Qt Creator code base. The plugin interfaces evolved in the
meantime and target platforms like Android or QNX have 99% of
their code in separate plugins.

In case anyone wants to revive Symbian support in Qt Creator,
please create a plugin for it.

Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-22 13:42:42 +02:00
hjk
6a7cf405bd rename QtDebug to QDebug
More uniform.

Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-06 14:55:08 +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
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
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
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
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
a322bd606f Replace qt-info@nokia.com with info@qt.nokia.com
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-07-06 11:14:01 +02:00
Thorbjørn Lindeijer
335f6ad0f7 QmlJSInspector: Renamed Observer to Inspector
Manually redid Qt 4.8 commit 206ebd5af21d94c3f3b49d2cb645105a63e6f5fb,
to make future code synchronization easier.

In order not to have to change the QmlApplicationViewer again, a
compatibility class QDeclarativeViewObserver is retained that subclasses
QDeclarativeViewInspector.

Change-Id: Ief87ae2f8f76b1db0c9d65085e4832424b277603
Reviewed-on: http://codereview.qt.nokia.com/242
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-31 09:44:09 +02:00
Friedemann Kleint
774fa49412 Fix more krazy warnings. 2011-04-19 15:43:53 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
con
530e7494dd Automatic versioning for the qml tools.
Reviewed-by: Thomas Hartmann
2011-03-29 17:54:52 +02:00
Thorbjørn Lindeijer
a8bf2ba5e3 QmlJSDebugger: Renamed "execution paused" to "animation paused"
The latter better describes what is paused, since expressions are
actually still executed.

Suggested by Kai.
2011-03-22 10:40:46 +01:00
Thorbjørn Lindeijer
42b4e6c8f1 Observer: Fixed synchronization of animation speed and paused state
The menus of the Observer were not being updated correctly when
animation speed was changed or when the animations were paused.

Now the whole thing looks a bit cleaner and the Observer menu
uses the QDeclarativeViewObserver to change these settings and stays in
sync when they change from other places.

Reviewed-by: Kai Koehne
2011-03-22 10:40:46 +01:00
Kai Koehne
6507f5ff83 QmlObserver: Allow to compile it again in source
Make it possible (again) to compile qmlobserver in share/qtcreator.
However, build artifacts in there might result in a malfunctioning
qtc-qmlobserver!

Reviewed-by: Thorbjorn Lindeijer
2011-02-21 16:40:53 +01:00
Kai Koehne
fbca39aefd QmlJsDebug: Fix compilation on Linux, Mac
Use camel case for library name all over the place.
2011-02-21 11:44:34 +01:00
Kai Koehne
3fef120d59 QmlJSDebug: Move qmljsdebug into a static library
Reviewed-by: dt
2011-02-18 12:57:45 +01:00
Friedemann Kleint
e39386352a Header cleanup in share/qtcreator/qml, specify module name. 2011-01-24 12:30:21 +01:00
Kai Koehne
b0184e9187 QmlObserver: Fix compilation when no private headers are installed
Regression introduced in 17d11b7be3.
2011-01-13 10:45:00 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
Kai Koehne
17d11b7be3 Update qmlobserver with latest qmlviewer patches
Update qmlobserver with changes in qmlviewer until 376e636eccedb8d8bb.
2010-12-10 13:25:26 +01:00
Kai Koehne
d2ed221b1b QmlObserver: Add 'show app on top' switch to creator + qmlobserver
This is convenient especially in the observer mode.

Reviewed-by: Christiaan Janssen
2010-11-23 16:24:23 +01:00
Kai Koehne
8b59a52bc1 Revert "make compile against 4.7 mainline"
This reverts commit 110c58d09e,
and enables qmljs debugging again.
2010-11-19 15:52:11 +01:00
Oswald Buddenhagen
04d4d309f7 Merge remote branch 'origin/2.1'
Conflicts:
    share/qtcreator/static.pro
    src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
    src/plugins/projectexplorer/outputwindow.cpp
2010-11-15 19:03:18 +01:00
Kai Koehne
4201046b9b QmlObserver: Remove breadcrumb widget in observer mode
I wasn't able to get it working on Mac OS X: Putting it on top
of the QGraphicsView doesn't work because Cocoa doesn't allow a
widget to be on top of OpenGL viewport. Embedding it as a
QGraphicsProxyWidget produces lots of Cocoa warnings (raster engine related).

Anyhow, the same widget shows up in the Debugger/Observer tab of
Qt Creator.

Reviewed-by: Lasse Holmstedt
2010-11-11 12:51:15 +01:00
dt
4ac7253205 Merge remote branch 'origin/2.1'
Conflicts:
	share/qtcreator/static.pro
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
	src/plugins/qt4projectmanager/qtoutputformatter.cpp
	src/plugins/texteditor/generichighlighter/highlightersettings.cpp
2010-11-10 17:02:40 +01:00
Kai Koehne
3d758f12c4 QmlObserver: Fix compilation if no private headers are installed
Use the copy of the qdeclarativedebughelper_p.h that we have in
qtcreator instead.

Reviewed-by: Christiaan Janssen
2010-11-09 12:40:06 +01:00
Bill King
110c58d09e make compile against 4.7 mainline 2010-11-09 14:53:21 +10:00
Kai Koehne
26f79571e6 QmlObserver: Use new 4.7.1 API to enable qml debugging
Qml debugging is now disabled by default, and has to be enabled
explicitly (b2016bbfc9). This has to be done before the
QDView/QDEngine is instantiated ...

Reviewed-by: Alessandro Portale
2010-11-03 14:07:16 +01:00
Kai Koehne
665527346c QmlObserver: Fix "Waiting for connection ..." message box on exit (Windows)
Disable the message box feature alltogether: Debugging output should be
captured by QtCreator already.

Task-number: QTCREATORBUG-2748
2010-10-15 12:54:07 +02:00
Kai Koehne
0a8c34d382 QmlApp: Only use QMLJSDEBUGGER define to activate qml debugging
Don't confuse users by two defines they have to comment in when
they just want to 'debug': Instead QMLJSDEBUGGER now activates
both the Js Debugger & and the QmlObserver services. Finetuning
can still be done by using the (undocumented) NO_JSDEBUGGER,
NO_QMLOBSERVER defines.
2010-10-13 16:52:58 +02:00
Kai Koehne
8162839827 QmlJSDebugger: Remove reference to JSDebugger in QDeclarativeViewObserver
Make Observer and JSDebugger orthogonal.
2010-10-13 16:52:58 +02:00
Kai Koehne
878f146ede QmlObserver: Fix QPainter warnings
The specified images in the resources weren't part of the qmlobserver,
and therefore 'tinting' then resulted in QPainter errors.

Task-number: QTCREATORBUG-2562
Reviewed-by: Lasse Holmstedt
2010-10-08 15:51:55 +02:00
Kai Koehne
5532f939b5 QmlObserver: Fix compilation if no private headers are installed
Don't support the Recording + Test Script features if there are
no private headers installed.

Reviewed-by: Lasse Holmstedt
2010-10-06 14:59:25 +02:00
Lasse Holmstedt
2578810334 Debugging helpers: Preserve whole build log
Otherwise, users might only see parts of the build that succeeded, but
not the failed ones (depending on build order).

Reviewed-by: ckamm
2010-10-04 12:03:35 +02:00
Lasse Holmstedt
91c0df0689 Build QMLObserver and qmldump only in debug mode
The problem is that we actually should have both debug & release builds,
but we don't have detection at the moment which binary to use.
See QTCREATORBUG-2496

Reviewed-by: Thomas Hartmann
2010-09-29 10:57:16 +02:00
Lasse Holmstedt
64f980a38b Fixed copying files from share
Reviewed-by: kkoehne
2010-09-29 10:07:19 +02:00
Lasse Holmstedt
96d991bbdc QML Observer: Build together on runtime with debugging tools
Moved qmljsdebugger to a dir under qml/, made qmlobserver compile
without creator dependencies and made it compile with debugging
helpers.

Reviewed-by: hjk
2010-09-29 09:39:30 +02:00