This patch allows compiling the qml(1)puppet with Qt 5.
Some minor fixes for private headers, cleaning up some old code
and QUrl::UrlFormattingOption got renamed.
Change-Id: I732f9f9ef0b831d09134b1d2c013efda55e36e11
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit fee6b56a7c)
We already did some refactoring on this part in master.
Change-Id: Ia878afa3aa773d2496343e052ababf30da9351d7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This patch allows compiling the qml(1)puppet with Qt 5.
Some minor fixes for private headers, cleaning up some old code
and QUrl::UrlFormattingOption got renamed.
Change-Id: I732f9f9ef0b831d09134b1d2c013efda55e36e11
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
'make install' now installs to $(INSTALL_ROOT)$$QTC_PREFIX/...
This is used for giving the contents of the 7zips an additional prefix.
(previously done by doing an additional copying step in bindistHelper).
QTC_PREFIX can also be used to give Qt Creator a different install path
at qmake time, and defaults to /usr/local on Linux.
On Windows and Mac there is no default for QTC_PREFIX.
Usage: qmake -r QTC_PREFIX=/qtcreator-2.6.0 && make &&
INSTALL_ROOT=/tmp/creator-dist make install
Change-Id: Id30781e14bfdde52531800f22b22e39f0459e806
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
The 4.8 Version of QDataStream is the lowest common denominator. temporaryOutDataStream.setVersion(QDataStream::Qt_4_8);
Change-Id: I4aa681473b6349bd3e859f49d7233ff4a6d2911b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
They are deprecated in Qt 5. Use fromLatin1() and toLatin1() instead. In
Qt 5, these always do the same thing as their "Ascii" counterparts. The
same goes for Qt 4, provided QTextCodec::setCodecForCStrings has not
been set, which it hasn't.
Change-Id: I04edeb376762b6671eff8156094f0d5e2cb8e1ea
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
They are deprecated in Qt 5. Call std::memset and std::memcpy instead.
Change-Id: I53c22283208b4d6fdfcba870c3b141f3c02001bd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
It depends on and mixes in changes made in another change on gerrit
that is not merged, so it breaks the package build.
This reverts commit c29bf6f652.
Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reason: $INSTALL_ROOT is only meant to be used by packagers
to temporarily put the contents into a different location,
which is needed for fakeroot packaging.
QTC_PREFIX is not a qmake variable, and defaults to
/usr/local. On Windows the default prefix is "QtCreator",
since "make install" is expected to be used in
a packaging context only where either INSTALL_ROOT
should be used or QTC_PREFIX should be set to the
absolute destination path where e.g. an installer
generator will pick it up.
Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Sending images over the local socket is slow, but the Mac has a 4MB limit
shared memory. So we now use what we get and than fallback to the local
socket.
Change-Id: Idf40ee1603572c9e45bb1ed3e1abc7caf19e6fca
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Qt Creator's support for Symbian was at its peak in version
2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6.
It is most likely rotten. Let's remove it!
Also, the Symbian support code was spread throughout the whole
Qt Creator code base. The plugin interfaces evolved in the
meantime and target platforms like Android or QNX have 99% of
their code in separate plugins.
In case anyone wants to revive Symbian support in Qt Creator,
please create a plugin for it.
Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Getting the #include directives ready for Qt5. This includes the
new-project wizards.
Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
