diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-11-19 17:55:49 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-28 16:15:59 +0100 |
commit | fd61d752e313bf91a09c85020b3fb50067c610c8 (patch) | |
tree | 5aeff0a1039acc3e7bf7ced21870cac42d491f9e /lib/widgets/widgets.pro | |
parent | 84a400e80d7e40aba2853411fdfb22f244c3e728 (diff) |
Moving sources to src part 1: Move files.
This only move files without adjusting any paths.
This moves:
- lib/quick -> src/webengine/api (API files)
lib/quick -> src/webengine (other files)
This contains the main QtWebEngine module library since
<ec7b2ee70a8b2db7fb87f50671a001ddd54697b0>.
- lib/widgets -> src/webenginewidgets
Also rename this directory to match its module name and rename Api to api.
- lib -> src/core
- process -> src/process
- resources -> src/core/resources
- tools/* -> tools/scripts/
The build directory is spread as follow:
- build/build.pro -> src/core/gyp_run.pro
- build/qmake_extras/* -> src/core/ (for the host and target .pro files)
- build/qmake -> tools/qmake
- Build related scripts -> tools/buildscripts
Change-Id: I0cded1de772c99c0c1da6536c9afea353236b4a1
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'lib/widgets/widgets.pro')
-rw-r--r-- | lib/widgets/widgets.pro | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/lib/widgets/widgets.pro b/lib/widgets/widgets.pro deleted file mode 100644 index 3338e0cf7..000000000 --- a/lib/widgets/widgets.pro +++ /dev/null @@ -1,47 +0,0 @@ -# Use Qt5 module system -load(qt_build_config) - -TEMPLATE = lib -TARGET = QtWebEngineWidgets - -MODULE = webenginewidgets - -# For our export macros -DEFINES += QT_BUILD_WEBENGINEWIDGETS_LIB - -QT += widgets -QT_PRIVATE += widgets-private gui-private core-private - -# FIXME: all this should eventually be turned into QT += webenginecore -macx:LIBPATH = $$getOutDir()/$$getConfigDir() -else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib -LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH -QMAKE_RPATHDIR += $$LIBPATH - -DESTDIR = $$LIBPATH - -INCLUDEPATH += Api ../ - -SOURCES = \ - Api/qwebenginehistory.cpp \ - Api/qwebenginepage.cpp \ - Api/qwebengineview.cpp\ - render_widget_host_view_qt_delegate_widget.cpp - -HEADERS = \ - Api/qtwebenginewidgetsglobal.h \ - Api/qwebenginehistory.h \ - Api/qwebenginepage.h \ - Api/qwebengineview.h \ - Api/qwebengineview_p.h \ - render_widget_host_view_qt_delegate_widget.h - -load(qt_module) - -# QNX ld only supports staging-relative rpath values and can't use the rpath specified above. -# Instead, append an appropriate rpath-link to lib_qt_webenginewidgets.pri. -qnx:!build_pass { - local_build_rpath_link = "QMAKE_RPATHLINKDIR += $$LIBPATH" - # MODULE_PRI is defined in qt_module_pris.prf - write_file($$MODULE_PRI, local_build_rpath_link, append) -} |