~abreu-alexandre/webbrowser-app/desktop-ua-override-fix-regexp

Viewing changes to src/app/CMakeLists.txt

Committer: CI bot
Author(s): Olivier Tilloy
Date: 2014-03-17 11:56:55 UTC
mfrom: (458.1.14 private-types)
Revision ID: ps-jenkins@lists.canonical.com-20140317115655-jzub8c3sltmabpub

Do not register private types in the public plugin.
Register them in the webbrowser application scope instead.

I have made sure that private types that were previously public are currently not being used by any application in the store, so this refactoring is safe.

files added:
src/app/webbrowser/assets

files removed:
src/Ubuntu/Components/Extras/Browser/domain-utils.cpp

files renamed:
src/app/PageDelegate.qml => src/app/webbrowser/PageDelegate.qml

src/app/TabsList.qml => src/app/webbrowser/TabsList.qml

src/app/assets/browser_favourite_off@30.png => src/app/webbrowser/assets/browser_favourite_off@30.png

src/app/assets/browser_favourite_on@30.png => src/app/webbrowser/assets/browser_favourite_on@30.png

src/app/assets/close_btn@9.png => src/app/webbrowser/assets/close_btn@9.png

src/app/assets/expanded_bottom_highlight@27.png => src/app/webbrowser/assets/expanded_bottom_highlight@27.png

src/app/assets/expanded_tooltip@27.png => src/app/webbrowser/assets/expanded_tooltip@27.png

src/app/assets/expanded_top_innershadow@27.png => src/app/webbrowser/assets/expanded_top_innershadow@27.png

src/Ubuntu/Components/Extras/Browser/bookmarks-model.cpp => src/app/webbrowser/bookmarks-model.cpp

src/Ubuntu/Components/Extras/Browser/bookmarks-model.h => src/app/webbrowser/bookmarks-model.h

src/Ubuntu/Components/Extras/Browser/domain-utils.h => src/app/webbrowser/domain-utils.h

src/Ubuntu/Components/Extras/Browser/history-domain-model.cpp => src/app/webbrowser/history-domain-model.cpp

src/Ubuntu/Components/Extras/Browser/history-domain-model.h => src/app/webbrowser/history-domain-model.h

src/Ubuntu/Components/Extras/Browser/history-domainlist-chronological-model.cpp => src/app/webbrowser/history-domainlist-chronological-model.cpp

src/Ubuntu/Components/Extras/Browser/history-domainlist-chronological-model.h => src/app/webbrowser/history-domainlist-chronological-model.h

src/Ubuntu/Components/Extras/Browser/history-domainlist-model.cpp => src/app/webbrowser/history-domainlist-model.cpp

src/Ubuntu/Components/Extras/Browser/history-domainlist-model.h => src/app/webbrowser/history-domainlist-model.h

src/Ubuntu/Components/Extras/Browser/history-matches-model.cpp => src/app/webbrowser/history-matches-model.cpp

src/Ubuntu/Components/Extras/Browser/history-matches-model.h => src/app/webbrowser/history-matches-model.h

src/Ubuntu/Components/Extras/Browser/history-model.cpp => src/app/webbrowser/history-model.cpp

src/Ubuntu/Components/Extras/Browser/history-model.h => src/app/webbrowser/history-model.h

src/Ubuntu/Components/Extras/Browser/history-timeframe-model.cpp => src/app/webbrowser/history-timeframe-model.cpp

src/Ubuntu/Components/Extras/Browser/history-timeframe-model.h => src/app/webbrowser/history-timeframe-model.h

src/Ubuntu/Components/Extras/Browser/tabs-model.cpp => src/app/webbrowser/tabs-model.cpp

src/Ubuntu/Components/Extras/Browser/tabs-model.h => src/app/webbrowser/tabs-model.h

src/Ubuntu/Components/Extras/Browser/webthumbnail-provider.cpp => src/app/webbrowser/webthumbnail-provider.cpp

src/Ubuntu/Components/Extras/Browser/webthumbnail-provider.h => src/app/webbrowser/webthumbnail-provider.h

src/Ubuntu/Components/Extras/Browser/webthumbnail-utils.cpp => src/app/webbrowser/webthumbnail-utils.cpp

src/Ubuntu/Components/Extras/Browser/webthumbnail-utils.h => src/app/webbrowser/webthumbnail-utils.h

src/Ubuntu/Components/Extras/Browser/webview-thumbnailer.cpp => src/app/webbrowser/webview-thumbnailer.cpp

src/Ubuntu/Components/Extras/Browser/webview-thumbnailer.h => src/app/webbrowser/webview-thumbnailer.h

files modified:
src/Ubuntu/Components/Extras/Browser/CMakeLists.txt

src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml

src/Ubuntu/Components/Extras/Browser/plugin.cpp

src/Ubuntu/Components/Extras/Browser/plugin.h

src/Ubuntu/Components/Extras/Browser/qmldir

src/app/CMakeLists.txt

src/app/WebViewImpl.qml

src/app/browserapplication.cpp

src/app/browserapplication.h

src/app/webbrowser/ActivityView.qml

src/app/webbrowser/BookmarksView.qml

src/app/webbrowser/Browser.qml

src/app/webbrowser/CMakeLists.txt

src/app/webbrowser/TimelineView.qml

src/app/webbrowser/webbrowser-app.cpp

src/app/webbrowser/webbrowser-app.h

src/app/webbrowser/webbrowser-app.qml

src/app/webcontainer/CMakeLists.txt

src/app/webcontainer/WebApp.qml

src/app/webcontainer/webapp-container.h

src/app/webcontainer/webapp-container.qml

tests/unittests/bookmarks-model/CMakeLists.txt

tests/unittests/domain-utils/CMakeLists.txt

tests/unittests/history-domain-model/CMakeLists.txt

tests/unittests/history-domainlist-chronological-model/CMakeLists.txt

tests/unittests/history-domainlist-model/CMakeLists.txt

tests/unittests/history-matches-model/CMakeLists.txt

tests/unittests/history-model/CMakeLists.txt

tests/unittests/history-timeframe-model/CMakeLists.txt

tests/unittests/qml/CMakeLists.txt

tests/unittests/qml/tst_UbuntuWebView.qml

tests/unittests/qml/tst_UserAgent.qml

tests/unittests/tabs-model/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

src/app/CMakeLists.txt

${CMAKE_CURRENT_BINARY_DIR}/config.h

@ONLY)

set(COMMONLIB webbrowser-common)

set(COMMONLIB_SRC

browserapplication.cpp

webbrowser-window.cpp

)

add_library(${COMMONLIB} STATIC ${COMMONLIB_SRC})

qt5_use_modules(${COMMONLIB} Core Network Qml Quick Widgets)

file(GLOB QML_FILES *.qml)

install(FILES ${QML_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app)

install(DIRECTORY actions DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app

add_subdirectory(webbrowser)

add_subdirectory(webcontainer)

Older »