feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,523 Commits 108 Branches 368 Tags
dfbe7995902e74b51e43a08f3ddc39f415e7075b
Commit Graph

25 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
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
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
 2012-10-05 21:20: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
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
Eike Ziller
804ae90c80 Mac: Fix Qt5 debug helper compilation. 
Task-number: QTCREATORBUG-7917

Change-Id: I6e76923e02c9c1ccc411d2f0978fe63e867e6469
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-24 12:01:03 +02:00
Christian Kandeler
3d9e492860 Do not use the fromAscii() and toAscii() functions. 
They are deprecated in Qt 5. Use fromLatin1() and toLatin1() instead. In
Qt 5, these always do the same thing as their "Ascii" counterparts. The
same goes for Qt 4, provided QTextCodec::setCodecForCStrings has not
been set, which it hasn't.

Change-Id: I04edeb376762b6671eff8156094f0d5e2cb8e1ea
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2012-09-21 21:03:48 +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
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Marc Mutz
7eaaab6e73 Add spaces between macros and string literals 
Commit fa66a540 fixed string literal and macro concatenation
some time ago, but while it changed "literal1"M1"literal2" to
"literal1" M1 "literal2" it didn't touch M"literal". This patch
changes this to M "literal" for consistency.

This patch is the remnant of a cherry-pick of a C++11 compilation
fix equivalent to fa66a540 from KDAB's branch of QtC 2.4.0.

Change-Id: I87644e888a7e74b18d4b1ca10786cdc3fa798453
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-06-19 12:47:27 +02:00
Jędrzej Nowacki
f4ea50b527 QDumper build fix after QVector change. 
Internal type QVectorData was removed, current implementation of
QVector is based on common QArrayData interface.

Change-Id: I016efa1013f0fdf809600eee4f38098d8ea3ab8f
Reviewed-by: hjk <qthjk@ovi.com>
 2012-06-05 14:45:33 +02:00
hjk
02e08c61d7 debugger: compile fix for mac dumpers and Qt 5.0 
QMap/QMultiMap is disabled, not fixed.

Change-Id: I024317f428a2b0ec518ea9a44ca0743121315dbd
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-02 15:18:12 +02: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
Erik Verbruggen
40810e7596 Changed Q_TYPENAME to typename for Qt5. 
Change-Id: Id831fe1268cbd7fcf3c25378876d969752fa2ebd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-13 11:21:39 +01:00
hjk
0238f919cc debugger: make compile dumpers compile without Qt 
Change-Id: I08c45d890beabc51e5fed0bfc81fd8cc419bf8a3
Reviewed-by: hjk <qthjk@ovi.com>
 2011-12-14 14:32:15 +01:00
hjk
d7a9881db5 debugger: make compile dumpers work on Qt 4.5 
Task-number: QTCREATORBUG-6616
Change-Id: Id01238d4ec767a0e9f8d05cedff4850106b6e318
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-30 16:43:39 +01:00
Friedemann Kleint
21124e927f C++-Dumpers: Compile with Qt 5. 
Change-Id: I97bb5f03fffc306035ab6e4b4c2d7ec5e434be2e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-11-24 13:41:23 +01:00
hjk
fa66a540fd fix C++11 string literal incompatibility 
Change-Id: Ie5d484ba7078f29eae6636d01e1d99e3e45d1a45
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-22 15:51:41 +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
Robert Loehning
1b76f67d76 Removed dead assignments 
Change-Id: I7cd0e127c23d209d210385906d0923bce650a3e5
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-25 13:10:55 +02:00
Robert Loehning
a7f17f8bdb Compile fix 
Change-Id: I1999e7ccc7e7fe45d656a6aa1ed7d51d827194d7
Reviewed-on: http://codereview.qt-project.org/6367
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-10 20:00:00 +02:00
Friedemann Kleint
dd078ede85 Debugger: Compile manual debugger tests and dumber lib with Qt5. 
Introduce conditionals in the profiles and source code to
be able to test Qt 4 and Qt 5.

Change-Id: I73df5558f2945742d3e56f94baca0ee4d5f9dab8
Reviewed-on: http://codereview.qt-project.org/6330
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-10 18:32:05 +02:00
hjk
fda652a43e debugger: rename gdbmacros* to dumper* 
Was mis-named from the beginning.

(cherry picked from commit 2f119dc2f85b28274d47ff635188872d5ed11521)

Change-Id: I4f2e388edfdded117c5b35d3d04bbdc68d77afa4
Reviewed-on: http://codereview.qt.nokia.com/872
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-29 10:21:55 +02:00