feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
28,084 Commits 108 Branches 368 Tags
bebf8d50a9716a296e7646fde77acf2de42b0c4c
Commit Graph

26 Commits

Author SHA1 Message Date
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
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
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
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
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
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
8162839827 QmlJSDebugger: Remove reference to JSDebugger in QDeclarativeViewObserver 
Make Observer and JSDebugger orthogonal.
 2010-10-13 16:52:58 +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
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