AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a49477df95
qt5base-lts/qmake/doc/snippets/qmake
History
Frederik Gladhorn 34b14a8472 Merge remote-tracking branch 'origin/5.4' into 5.5 
Conflicts:
	examples/xml/htmlinfo/simpleexample.html
	examples/xml/rsslisting/rsslisting.cpp
	qmake/generators/win32/msbuild_objectmodel.cpp
	src/3rdparty/harfbuzz-ng/src/hb-private.hh
	src/corelib/global/qlogging.cpp
	src/corelib/io/qstorageinfo_unix.cpp
	src/corelib/thread/qwaitcondition_unix.cpp
	src/gui/kernel/qguiapplication.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
	src/testlib/doc/src/qt-webpages.qdoc
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp

Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff
2015-02-24 21:02:08 +01:00
..
comments.pro qmake: Replace qt-project.org/doc with doc.qt.io 2015-02-16 09:06:39 +00:00
configscopes.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
debug_and_release.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
delegate.h Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
dereferencing.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
destdir.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
dirname.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
environment.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
functions.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
include.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
main.cpp Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
model.cpp Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
model.h Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
other.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
paintwidget_mac.cpp Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
paintwidget_unix.cpp Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
paintwidget_win.cpp Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
precompile-stable.h Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
project_location.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
qtconfiguration.pro make property name doc match reality 2014-03-15 10:44:34 +01:00
quoting.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
replace.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
replacefunction.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
scopes.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
shared_or_static.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
spaces.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
specifications.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
testfunction.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
variables.pro Doc: Fixed qmake manual's images and snippets directories. 2013-08-13 01:38:54 +02:00
view.h Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00