summaryrefslogtreecommitdiffstats
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
* Move core_generated.gyp to build directoryAllan Sandfeld Jensen2016-07-271-1/+0
| | | | | | | | | Changes core_generated.gyp from being generated in the source directory to being generated in the build directory. Task-number: QTBUG-43014 Change-Id: Ia67df47bfadbf5dfca6e60a613dcf7b162b468fd Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
* Strip down demobrowser to become simplebrowserMichal Klocek2016-03-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Demobrowser changes: * remove QLocalServer/Socket * remove AutoSaver * remove restoreLastSession * remove general QSettings * remove downloadManager * remove bookmarkManager * remove historyManager * remove searchBar * favor setStyleSheet over overriding paint methods * use lambdas where suitable * use QProgressBar instead of own painted widget * use QToolButton instead of own painted buttons * remove QStackWidget, use single UrlLineEdit per window instead of per tab * split files to keep own classes: webpage and webview * remove tracking windows by QPoiner * remove WebPageActionMapper, TabBar classes * remove QDrag dead code * remove special OS X close app handling * fix encapsulation, clean up application logic Change-Id: I4849b6a2de739dea4f01229abdb90418601a2397 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com>
* rename fancybrowser to contentmanipulationJoerg Bornemann2015-12-171-2/+2
| | | | | | | | | | | The name "fancybrowser" tricks people into thinking that this is the reference browser example. But this example is a very simple browser with an additional fancy content manipulation feature. Rename this example to contentmanipulation to reflect reality. Change-Id: I200b701acdc4de1210b550b9f054753e5f1d1ea4 (cherry-pick from eb8eb72ec7e589eedd79143dc7c3fb241706f405) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Allan Sandfeld Jensen2015-09-241-1/+0
|\ | | | | | | Change-Id: Ice3d6e88238940a62d75e7c67f63b626285fccb0
| * do not generate qmake_extras.gypi in the source directoryJoerg Bornemann2015-09-091-1/+0
| | | | | | | | | | | | | | | | | | | | Among other things, we store the used compiler in there. This information belongs into the build directory. Otherwise switching toolchains becomes challenging. Task-number: QTBUG-43014 Change-Id: I9bec26a235f5251322792632d4667cc71210286d Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Add public QtWebEngineCore C++ APIAndras Becsi2015-06-081-0/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces a new public C++ API layer in preparation to make it possible to integrate with lower level Chromium features related mostly to networking operations like accessing and blocking cookies, custom request headers, etc. This API layer can be used both by Qt Widgets and Qt Quick applications with a small C++ core. It should contatain API to access features that usually run on the IO thread to make it possible to perform heavy tasks that would otherwise require costly context switches to the UI thread. Furthermore for these features a QML API does either not make sense, since they are non-UI-related, or a QML API is simply not feasible, because the API is meant for advanced usecases like web browser development (i.e. custom protocol handlers, network traffic interception cookie syncing, etc.). In the long term this layer could also make it possible to reduce code duplication in the widgets and quick layers by moving common parts to the core layer. The new API is built entirely by qmake as a separate static library which is then linked into the QtWebEngineCore library built by gyp and ninja, to prevent the build options passed to Chromium to break the API layer. As a first step this only contains the global headers for core. Change-Id: Iccf8544587cde7c0d9c6abd462e4766bf9ec81ae Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Fix Menu ui delegate after on__MenuClosed has been renamedAndras Becsi2015-05-121-0/+3
| | | | | | | | | | | The internal on__MenuClosed signal has been renamed to onAboutToHide in qtquickcontrols. Also update some import versions while we're at it. This patch also adds examples OSX application bundles to .gitignore which only contained the unix binaries. Change-Id: If1d91cb65987dda6d0e10794c1649b1b4e1ccde3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Add .pch and .obj directories to .gitignoreMichael BrĂ¼ning2015-01-231-0/+2
| | | | | Change-Id: I22ff2a3fc8ba3b25aceb6d11ce2e1093afef8f1e Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update .gitignore with build artifactsAndras Becsi2014-06-051-0/+2
| | | | | | | | This hides the prepared patches directory for upstream builds and gyp cache files produced for idl files. Change-Id: I340e5f6af5169810a780c9295d19bc7ce5fefd8c Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Update .gitignoreJocelyn Turcotte2014-03-191-15/+18
| | | | | | | | | | | | Adapt to the move of out/(Debug|Release) to src/core/(Debug|Release) This also changes individual tests binary rules into a tst_* rule and a negating tst_*.* to unmatched non target binaries. Move more general file globs at the end of the list so that the negation doesn't also negate those general rules (e.g. *.o). Change-Id: Ie953da6cf255adfee7d4b04e91a6528558918ebc Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* gitignore updatePierre Rossi2014-01-221-5/+6
| | | | | | | to unclutter git status --untracked once again Change-Id: Ia329f321e1e1689cbb990d66580234c666bb5416 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* More gitignore patternsPierre Rossi2013-12-031-1/+3
| | | | | | | Also whitelist core.gyp in prevision for a handwritten one. Change-Id: I8122d71893158e745f1368fc1b9d0d7aab3d220b Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Moving sources to src part 2: Adjust paths.Jocelyn Turcotte2013-11-281-4/+1
| | | | | | | | | | | | | | | | | | | NOTE: To build after this you should rerun init-repository.py or run $> git submodule sync $> git submodule update $> git config qtwebengine.chromiumsrcdir src/3rdparty This makes everything build by adjusting paths. Other mixed-in changes: - Rename qtwebengine_src variables in scripts to qtwebengine_root to avoid confusion. - Cleanup the release and debug extra targets that were in lib.pro. This file has also been split into src.pro and core.pro. Change-Id: Ieee9158a65f526b15244eaca59e779b7069d337e Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Import fancybrowser examplePierre Rossi2013-11-121-0/+1
| | | | | Change-Id: Ia61fbe3ef6b76c7530d10d4a3305d4208b3469ef Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* More .gitignore patternsPierre Rossi2013-09-111-2/+12
| | | | | | | This is to unclutter git status --untracked Change-Id: I782066cf24f0b9ddf7ab4e94d1feb0257bbe0c52 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Revert "Add 3rdparty_upstream and 3rdparty to .gitignore"Andras Becsi2013-08-261-2/+0
| | | | | | | | This reverts commit e13b70626cdc593d9cfad48b9ffff6d4c4993585 since it seems to cause problems with the init-repository script. Change-Id: Ie8a038041b3a17dcb0bb1f629285205a328a6819 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Add 3rdparty_upstream and 3rdparty to .gitignoreAndras Becsi2013-08-261-0/+2
| | | | | | | This should prevent them showing up in the pushed changes on gerrit. Change-Id: Id750d8b80baffc61cba804840d2c1199e6372374 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* More ignore patternsPierre Rossi2013-06-191-0/+5
|
* more files to ignorePierre Rossi2013-06-101-0/+4
|
* Add out/ to .gitignorePierre Rossi2013-04-191-0/+1
|
* Hack: Link process with hard-coded list of static libsSimon Hausmann2013-04-111-0/+3
We need to replace this with a properly dynamically generated list of dependencies, but for prototyping this will have to do the trick.