Commit Graph

21 Commits

Author SHA1 Message Date
Enrico Forestieri
6781444835 Warn user that build will fail if bc is not installed.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39945 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-23 15:35:36 +00:00
Stephan Witt
39645b33b4 correct the Qt framework names
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35527 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-28 19:27:10 +00:00
Stephan Witt
d18995cd79 #6874 prepare configure based build with Qt4 frameworks
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35524 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-28 15:07:07 +00:00
Jean-Marc Lasgouttes
84880b5842 cleanup the help messages of the configure script; now --with-version-suffix shows what the default suffix is
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31542 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-06 14:05:57 +00:00
Enrico Forestieri
1ad4fd55ea Remove traces of Q_CYGWIN_WIN
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26916 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-15 23:00:42 +00:00
Jean-Marc Lasgouttes
ca67cfffe0 do not check for X libraries if pkg-config succeeded
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26829 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-09 14:10:09 +00:00
André Pönitz
c6886926ec remove unused defines QT_CLEAN_NAMESPACE and QT_GENUINE_STR
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23867 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-21 15:08:36 +00:00
André Pönitz
1aed51c75c configure chack for rcc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20733 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-04 16:57:16 +00:00
Jean-Marc Lasgouttes
6f042448a1 honor all the link flags coming from pkg-config
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19285 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-03 10:36:49 +00:00
Jean-Marc Lasgouttes
a7039727c3 * configure.ac: check earlier for -liconv and -lz, since Qt4 needs them;
put LIBICONV in LIBS.

	* src/Makefile.am: 
	* src/client/Makefile.am: update accordingly.

	* config/qt4.m4: do not try to run pkg-config tests when pkg-config 
	is not installed.

	* INSTALL.MacOSX: advise to use pkg-config; remove -lz from LDFLAGS;
	remove --with-frontend=qt4 from configure line; in the svn case, remove
	also --disable-stdlib-debug and --disable-concept-checks (and explain 
	why --disable-stdlib-debug may be needed).



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19056 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-12 12:57:59 +00:00
Jean-Marc Lasgouttes
b5c00e2464 * config/qt4.m4 (QT4_DO_PKG_CONFIG): use = instead of == to check for equality with 'test' (bug 3770)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18575 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-30 06:00:31 +00:00
Jean-Marc Lasgouttes
b6bc406d56 fix setting of PKG_CONFIG_PATH for qt 4.3
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17973 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 07:53:19 +00:00
Georg Baum
04debb8056 Revert unwanted stuff from last commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16932 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-29 18:37:13 +00:00
Georg Baum
a76050219a Fix LyX paste from system clipboard when the file format does not match
* src/buffer.C
	(Buffer::readString): Tell readFile that we do not have a file
	(Buffer::readString): readFile(name) returns a bool, not an enum


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16931 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-29 18:35:56 +00:00
Georg Baum
b89f97f0b4 fix manual qt configuration in these cases:
- pkgconfig is missing
- pkgconfig is available, but it does not have any qt information
by Jean-Marc and me


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16271 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-13 21:18:44 +00:00
Georg Baum
fe5c73915e Make libQtCore a support library like boost and implement encoding conversion
from/to the local 8bit encoding with it.
Only the autotools build system is updated, scons and cmake users need to
add qt4 cpp flags when compiling libsupport, and link libsupport against
libQtCore.

	* src/frontends/qt4/qt_helpers.[Ch]
	(toqstr, qchar_to_ucs4, ucs4_to_qchar, ucs4_to_qstring,
	 qstring_to_ucs4, fromqstr): Move these qstring conversion functions
	from here ...

	* src/support/qstring_helpers.[Ch] ... to these new files

	* src/support/docstring.[Ch]
	(from_local8bit): new conversion function from local 8bit encoding
	to ucs4
	(to_local8bit): new conversion function from ucs4 to local 8bit
	encoding to ucs4
	(to_local8bit_failure): exception that is thrown by to_local8bit if
	the argument cannot be converted to the local encoding

	* src/support/filename.C
	(FileName::toFilesystemEncoding): implement with the help of QFile

	* src/support/Makefile.am: Add new files, qt4 cpp flags and link
	against libQtCore

	* src/client/client.C: Convert commandline input from local encoding
	to ucs4. Convert stuff that is sent to to the server to utf8,
	because LyX interprets it as utf8 on the other end of the pipe.

	* src/lyx_main.C
	(LyX::exec): convert commandline input from local encoding to utf8
	(LyX::init): ditto
	(LyX::easyParse): ditto

	* development/scons/scons_manifest.py: Add new files

	* config/qt4.m4: Define new variables QT4_CORE_INCLUDES,
	QT4_CORE_LDFLAGS and QT4_CORE_LIB


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16257 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-12 20:19:46 +00:00
Abdelrazak Younes
b486b53f8f Patch from Enrico:
Avoids the crash when quitting LyX on Cygwin/qt4


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14860 a592a061-630c-0410-9148-cb99ea01b6c8
2006-09-01 13:49:03 +00:00
Jean-Marc Lasgouttes
fa2a87de9b Qt4 autoconf cleanup.
* config/qt4.m4 
	(QT4_FIND_PATH, QT_FIND_UIC4, QT_FIND_MOC4): remove,
	AC_PATH_PROGS does this very well. 
	(QT4_DO_PKG_CONFIG): add $QT4DIR/lib to pkg-config search path;
	do not run QT4_DO_MANUAL_CONFIG on failure. 
	(QT4_DO_MANUAL_CONFIG): remove some code.
	(QT4_DO_IT_ALL): move code to handle --with-foo here; move
	code to search for moc/uic here; call QT4_DO_PKG_CONFIG first,
	and QT4_DO_MANUAL_CONFIG on failure.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14829 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-24 09:33:14 +00:00
Abdelrazak Younes
3942d5eac1 get rid of QT3_SUPPORT
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14774 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-17 09:11:14 +00:00
Lars Gullik Bjønnes
96313cdcb5 Make QT4 config use pgk-config if available
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14520 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-30 21:33:59 +00:00
Lars Gullik Bjønnes
110a4f1117 split the qt.m4 in two, separate file for qt4
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14491 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-22 11:23:41 +00:00