feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
36,562 Commits 108 Branches 368 Tags
139449239c7cd63ab933d13e20b37cd717a45fe7
Commit Graph

24 Commits

Author SHA1 Message Date
Orgad Shaneh
27cbc89c5b Android: Remove unneeded null validation 
Change-Id: Iede5baafd13f8b1a997336d843004e6423985616
Reviewed-by: BogDan Vatra <bogdan@kde.org>
 2014-05-21 13:28:47 +02:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
hjk
d7d27fccbc Rename plugins/qt4projectmanager to qmakeprojectmanager 
This finally renames the plugin itself.

Change-Id: Ibdf4f4b4e9776c2fdc809e0127f3e1310de44bd1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-29 17:57:06 +01:00
hjk
ce9c2efd1f Qt4ProjectManager: Rename {Qt4,Qmake}{Project,Pr{i,o}FileNode} 
Change-Id: I27139d8ccc17b665853bec4a37e80568680b5fcc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-10-29 14:54:53 +01:00
hjk
35695ebb0c Qt4ProjectManager: Rename the "normal" qt4* files to qmake* 
Change-Id: I5e173900a4008c72c67a30eaa9c101027c1b43af
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-10-16 14:30:05 +02:00
hjk
ebcd992577 Rename namespace Qt4ProjectManager to QmakeProjectManager 
First step towards plugin renaming.

Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-10-16 12:09:59 +02:00
Daniel Teske
1262310798 Android: androiddeployqt support 
Change-Id: I37d706b4e11c6e1353a8ee73378b7d080080678c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-09-26 17:13:27 +02:00
Friedemann Kleint
92207c96b7 Clean headers in ProjectExplorer. 
Change-Id: If61a8a91d2a39c5c97974a5bfcef91892b68d3f1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-03-26 12:37:29 +01:00
Friedemann Kleint
6da08b530f Fix Krazy warnings about includes/header guards in Android. 
Change-Id: I921be0a520341457bf96bbcc3a1caa6e09a9cb6f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-12 13:56:19 +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
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
Daniel Teske
d7993c717d Make DeployConfigurations cloneable 
The API was there just not the correct implementation.

Change-Id: I65468f3c00f3c8ba1b853f8c11f6296813d1a966
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-09-28 10:51:59 +02:00
Tobias Hunger
8ba422d07c s/profile/kit/ 
* Rename profiles to kits.
* Update some strings:
   * projects mode has a Kits tab, not a Targets tab.
   * " Settings" was dropped from the sub-tabs of the Kits tab
   * menu entry "Build/Open Build/Run Target Selector" was renamed
     to "Build/Open Build and Run Kits Selector".
   * Use "Kit" instead of "Target" in miniprojecttargetselector.
     (The class was not renamed as it does indeed select targets,
      not kits)

Change-Id: I0727e086e2dfa0e8aaaf89fdc6f2e3596c7a4314
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-09-04 15:24:25 +02:00
hjk
bab670af67 android: code cosmetics 
Fix whitespace, capitalization, naming, comments, add 'using'
in .cpp, remove 'using' in .h, remove unneeded Q_UNUSED, add
needed Q_UNUSED, etc.

Change-Id: Ibf9ba57850cbea1e79e152ec0165c8b01fa66567
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-12 22:40:41 +02:00
hjk
83e573f2ec use new id comparison operators to reduce line noise and save cycles 
Change-Id: I2e7d81a4efb75877901d29964df4f71314e951b4
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-08-06 10:37:43 +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
Friedemann Kleint
29a65750f6 Fix tr() error in Android plugin, use QT_NO_CAST_FROM_ASCII. 
Change-Id: I7ccc55c914b4d5447ad238acfb2ff76cc28d6b23
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-07-16 12:40:21 +02:00
BogDan Vatra
a16d355dce More Android fixes, add default android device. 
Switch to new android assests scheme

Change-Id: I34bf52cbb085b76df66e40391160d189301aafd2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-07-04 11:26:56 +02:00
BogDan Vatra
bb0573a8aa Fix Android plugin. 
Change-Id: I56533be94fc868d04bd1d289ff9d3c381391d41b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-23 11:53:33 +02:00
Tobias Hunger
2431456216 Profile introduction 
Introduce Profiles to store sets of values that describe a system/device.

These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.

This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.

Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-06-21 12:08:12 +02:00
Tobias Hunger
df5dab6382 Use Core::Id in project-related objects 
Use Core::Id for all the project related objects in favor of plain
QStrings.

Change-Id: I790ab40cb29899efdb49c413a77609486f52e683
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-25 11:49:19 +02:00
BogDan Vatra
50e8f7bb7b Android plugin 
Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-04-24 12:25:40 +02:00