feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
73,413 Commits 108 Branches 368 Tags
fea67b17f9b03be2e87d4ed9fdad2bf12961bf8c
Commit Graph

82 Commits

Author SHA1 Message Date
Victor Heng
48423414f6 JsonWizard: Check widget visibility when determining if it's mandatory 
The wizard is unable to advance when a mandatory field is hidden. Assume
a hidden widget is not mandatory.

Change-Id: I19bdc1a661d91b75151d3aec34ad9d584002a556
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-06-01 04:55:45 +00:00
Tobias Hunger
95ac4edfd4 Projectexplorer: Modernize codebase 
Change-Id: I4793b58aa77bcd46af99f8b843c0f7439cdc9269
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
 2016-04-15 09:40:53 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation 
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 15:57:01 +00:00
Tobias Hunger
0f34f9e606 JsonWizard: Allow for HistoryCompleter on lineedits and pathchoosers 
Change-Id: I93ebe655e2b3526c566b32c5d62ef915906d32a4
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-12-14 14:25:48 +00:00
Tobias Hunger
e5193fe209 JsonFieldPage: Sprinkle the code with auto 
Change-Id: Ic8e65d352897bf5b47c8362936830266f55a233c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Benjamin Zeller <benjamin.zeller@canonical.com>
 2015-09-22 09:23:56 +00:00
Tobias Hunger
4b77ae0718 JsonWizard: Allow for custom widgets in the Field page 
... instead of having a hard-coded list of widgets you can use.

Change-Id: Iedf7016412ce9d619fea5cdffe6dbf86beda92b0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Benjamin Zeller <benjamin.zeller@canonical.com>
 2015-09-22 09:22:46 +00:00
Tobias Hunger
443f133d3e JsonFieldPage: Export the class and PIMPL the Field class 
Change-Id: Id40b12b80c6c02db70614da002c8a8e7f0ab98d9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Benjamin Zeller <benjamin.zeller@canonical.com>
 2015-09-22 09:22:33 +00:00
Tobias Hunger
84e7f8c0e6 JsonWizard: Split Fields out of fieldpage header 
Change-Id: I9029b8da8d095216ec320a8e03ec5f3d4092dddc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Benjamin Zeller <benjamin.zeller@canonical.com>
 2015-09-22 09:22:26 +00:00
Christian Kandeler
8d3aa026e0 Utils: Rename PathChooser::changed() signal. 
The name is overly generic, particularly with a pathChanged() signal
also present. Rename to "rawPathChanged", which adequately describes the
semantics.

Change-Id: Ia62b8b0a97a794cb6d5ad6b8ce0abcd36b5f5cdb
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-09-03 11:12:57 +00:00
Tobias Hunger
fc7ce7f0c8 JsonFieldPage: Be more paranoid with the index of ComboBoxes 
This avoids a combobox being shown without any selection. This has
the side-effect that QTCREATORBUG-14699 can no longer get triggered.

Task-number: QTCREATORBUG-14699
Change-Id: I98f5ae503d29370ad46c6620238bc2815c024747
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-07-09 09:17:45 +00:00
Leena Miettinen
3c1e53c8ac JSON Wizards: fix message punctuation and wording 
Change-Id: Ic144da9b9511dfd13960c2263be89dd06683e228
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-07-03 09:02:09 +00:00
Tobias Hunger
f68704f8fd JsonWizard: Make checkbox default values true and false 
That is closer to what a user expects than the "0" and "1" used
before.

Change-Id: I08b3a7b0361dd54b75ee7b2213b3d120fb016bf5
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2015-05-28 15:52:54 +00:00
Tobias Hunger
dbec2d21e1 JsonFieldPage: Add conditions to combobox entries 
Change-Id: I4982564fcb8160302206e12e64f2f2bba338e09f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-05-27 14:11:20 +00:00
Tobias Hunger
57e3714db4 JsonWizard: Remove member that is only ever read 
Change-Id: I87529de8fb600dfc08862143f708e445bc18ed47
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-05-20 09:03:51 +00:00
Tobias Hunger
e1f47f67b2 JsonFieldPage: Make the page honor the theme settings 
Change-Id: I9a286fa73392a86b6d7ed39389a7601450a42b88
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-05-13 10:07:03 +00:00
Tobias Hunger
63373ecc1d JsonFieldPage: Support tooltips for all fields 
Change-Id: Ie84e659d7cecf68753056db63a389173d725ebe4
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2015-05-12 15:17:52 +00:00
Tobias Hunger
c9ad077ee3 JsonWizard: Trigger complete change when triggering Checkboxes 
Change-Id: Idb81fee165f5950d8a4dbe51fc79822594f9b3c4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-05-12 12:18:50 +00:00
Tobias Hunger
0b4e958fb3 JsonFieldPage: Add isComplete and incompleteMessage to Fields 
This allows to do more sophisticated checks on the completion state
of the page.

Change-Id: Ibb6593fdc4e9c9f37e7d70c516f1a1410123191f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-05-12 12:07:54 +00:00
Sergey Belyashov
7fa58f1d99 Fix missing of some translations 
Task-number: QTCREATORBUG-13649
Change-Id: I69f78b3b8d2366003bfce81a2afba0068e716d22
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-03-24 07:04:46 +00:00
Leena Miettinen
6a3d376cb2 JsonWizard: use double quotes for emphasis 
Change-Id: I1b30fc146764517ef00949b9f5ecc3266c03fc78
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-03-16 13:50:27 +00:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01:00
Orgad Shaneh
23b4dc128f ProjectExplorer: Remove unneeded qualifications 
Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: I1d05d48b23f44e3d589cc2a790803714786b57d2
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-06 12:06:22 +00:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Robert Loehning
89ca18e4d7 Further string fixes 
Change-Id: Iab93aea9e7ec17dd8196a957f90beb1ee3179605
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2015-01-07 14:34:29 +01:00
Tobias Hunger
5e54037fc6 JsonWizard: Support fixup expandos for lineedits on FieldPages 
The fixup expando will be applied before validating a string in a
lineedit. It uses the special "%{INPUT}" variable for its input and
any change will be applied to the LineEdit.

Change-Id: Ia496eacdbe541d418acb4a977c274527387896ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-11-19 12:33:58 +01:00
hjk
cd53defc5d Restore JsonWizard expander functionality 
Task-number: QTCREATORBUG-13229
Change-Id: I91fd996cdbf5f3e71bdf817e9c5beebbb007681b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2014-10-23 12:43:57 +02:00
hjk
ef563d8085 MacroExpander: Fall back to global expander 
... and use that all over the place.

Change-Id: Ie6e0ed0f0d9eaba9b4466761e6b455f33a905086
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2014-10-16 16:32:58 +02:00
Tobias Hunger
52e31f80ad JsonWizard: Enable validators for lineedits on Fields pages 
Make use of a validator when entering C++ class names.

Change-Id: Id7f9c8c2e1fe036397a337595cbe7aa7fd9589d5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2014-10-15 18:21:55 +02:00
Tobias Hunger
50df8aa984 JsonWizard: Replace CppClassWizard with a JsonWizard 
Change-Id: I4e1aeea4ccd1087b5e804e9ba4c2aa8fde4f4fcb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2014-10-15 18:21:49 +02:00
Eike Ziller
9c7019f0b2 License update. 
Change-Id: I0acde2c3b995693de682679471f03af85bdd0a61
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-15 15:19:55 +02:00
Tobias Hunger
685bc9f0b5 JsonWizard: Fix spacer item in Fields page 
Calculate space to use based on better data:-)

Change-Id: Ia502deb3eb40e5b4a3828e531798971d120e9b0d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2014-10-15 12:07:15 +02:00
Tobias Hunger
86ecc7d13e JsonWizard: Add a customizeable page 
Add a way to define custom pages with checkboxes, lineedits, etc.
on it.

Change-Id: I012109eabf00a12abc67ae34514d139b7cd7cf0d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-10-14 21:32:03 +02:00